Imported Upstream version 2.4.0upstream/2.4.0upstream

227 files changed, 38106 insertions, 36429 deletions

diff --git a/ChangeLog b/ChangeLog
index b4d649b..d31eb1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,602 @@
+2022-12-16  Werner Koch  <wk@gnupg.org>
+
+	Release 2.4.0.
+	+ commit c0556edb80518720b0d884251685fe008c8f0429
+
+
+	common: Fix translations in --help for gpgrt < 1.47.
+	+ commit 30a98b0b2197709a1a89fda467951e2c269e6a26
+	* common/mapstrings.c (map_static_macro_string): Add hack.
+
+	gpg: Do not continue the export after a cancel for the primary key.
+	+ commit 49d16f4f6edf872babf04ae383974d891871a33b
+	* g10/export.c (do_export_one_keyblock): Handle a cancel for the
+	primary key special.
+
+	gpg: Replace use of PRIu64 in log_debug.
+	+ commit f297803a67cd6cff0d766dfe86798bbca602c083
+	* g10/cipher-aead.c (do_flush): Use %llu and a cast.
+	* g10/decrypt-data.c (aead_underflow): Ditto.
+
+	Update NEWS for 2.4.0.
+	+ commit fc8b811283d73251ddc97c649f0babe3005bb20b
+
+
+2022-12-16  NIIBE Yutaka  <gniibe@fsij.org>
+
+	tests: Fix make check with GPGME.
+	+ commit c19ea75f10d6278569619f90977ce7c820e9319d
+	* tests/gpgme/Makefile.am: Create directories for logs.
+
+2022-12-12  Werner Koch  <wk@gnupg.org>
+
+	agent: Allow arguments to "scd serialno" in restricted mode.
+	+ commit f9ea5dc831f9dd42877cd4e8bed9288b45250447
+	* agent/command.c (cmd_scd): Allow it.
+
+2022-12-09  Werner Koch  <wk@gnupg.org>
+
+	scd:p15: Skip deleted records.
+	+ commit 061efac03ff9b471138c76c61edb9f2c709a82ab
+	* scd/app-p15.c (select_and_read_record): Special case deleted
+	records.  Support 3 byte TLVs.
+	(read_ef_prkdf): Skip deleted records.
+	(read_ef_pukdf): Ditto.
+	(read_ef_cdf): Ditto.
+	(read_ef_aodf): Ditto.
+
+2022-12-09  NIIBE Yutaka  <gniibe@fsij.org>
+
+	build: Remove Windows CE support.
+	+ commit f32d0c9c0ff7a62d17e6c46e0e21fe00be22c114
+	* agent/Makefile.am [HAVE_W32CE_SYSTEM]: Remove.
+	* am/cmacros.am [HAVE_W32CE_SYSTEM]: Remove.
+	* autogen.sh: Remove W32ce_ variables.
+	* configure.ac: Likewise.
+	* dirmngr/Makefile.am (extra_bin_ldflags): Remove.
+	* g10/Makefile.am [HAVE_W32CE_SYSTEM]: Remove.
+	* kbx/Makefile.am: Likewise.
+	* sm/Makefile.am (extra_bin_ldflags): Remove.
+	* tools/Makefile.am (extra_bin_ldflags): Remove.
+
+2022-12-06  Werner Koch  <wk@gnupg.org>
+
+	wkd: Do not send/install/mirror expired user ids.
+	+ commit 278f85d1bc6cd012b3b2e87536e50954b21d2d91
+	* tools/gpg-wks.h (struct uidinfo_list_s): Add fields expired and
+	revoked.
+	* tools/wks-util.c (append_to_uidinfo_list): Add args expired and
+	revoked.
+	(set_expired_revoked): New.
+	(wks_list_key): Set expired and revoked.
+	(wks_cmd_install_key): Skip expired uids.
+	* tools/gpg-wks-client.c (command_check): Print flags.
+	(command_send): Ignore expired keys.
+	(mirror_one_key): Ditto.
+
+	* g10/export.c (do_export_stream): Silence warning.
+
+2022-12-05  Werner Koch  <wk@gnupg.org>
+
+	gpgsm: Print the revocation time also with --verify.
+	+ commit 58819c024a11dd89b01dd00ab7becba64feec7c7
+	* sm/certchain.c (is_cert_still_valid): Print revocation reason.
+
+	gpgsm: Fix "problem re-searching certificate" case.
+	+ commit 1c2bdd80b18fa43190ed7daff57a741e2a73cae2
+	* sm/keydb.c (keydb_set_cert_flags): Fix error test.
+
+	gpgsm: Print revocation date and reason in cert listings.
+	+ commit b6abaed2b5f6a6e52069f370c61006abdc81cdf5
+	* dirmngr/ocsp.c (ocsp_isvalid): Add args r_revoked_at and
+	r_revocation_reason.
+	* dirmngr/server.c (cmd_isvalid): Emit a new REVOCATIONINFO status.
+	(cmd_checkocsp): Ditto.
+
+	* sm/call-dirmngr.c (struct isvalid_status_parm_s): Add new fields.
+	(isvalid_status_cb): Parse REVOCATIONINFO.
+	(gpgsm_dirmngr_isvalid): Add args r_revoked_at and
+	r_revocation_reason.
+
+	* sm/gpgsm.h (struct server_control_s): Add fields revoked_art and
+	revocation_reason.
+	* sm/keylist.c (list_cert_raw): Print revocation date.
+	(list_cert_std): Ditto.
+
+	gpgsm: Silence the "non-critical certificate policy not allowed".
+	+ commit 4f1b9e3abb337470e5e4809b3a7f2df33f5a63a4
+	* sm/certchain.c (check_cert_policy): Print non-critical policy
+	warning only in verbose mode.
+
+	gpgsm: Always use the chain model if the root-CA requests this.
+	+ commit 7fa1d3cc821dca1ea8e1c80a0bdd527177c185ee
+	* sm/call-dirmngr.c (gpgsm_dirmngr_isvalid): Do not use
+	option --force-default-responder.
+	* sm/certchain.c (is_cert_still_valid): Rename arg for clarity.
+	(gpgsm_validate_chain): Always switch to chain model.
+
+2022-12-02  Werner Koch  <wk@gnupg.org>
+
+	gpg: New export option "mode1003".
+	+ commit 1a85ee9a431bd2243e0ad79ce5eefa78e274a491
+	* agent/command.c (cmd_export_key): Add option --mode1003.
+	(command_has_option): Ditto.
+	* g10/build-packet.c (do_key): Implement mode 1003.
+	* g10/parse-packet.c (parse_key): Ditto.
+	* g10/options.h (EXPORT_MODE1003): New.o
+	* g10/call-agent.c (agent_export_key): Add arg mode1003.
+	* g10/export.c (parse_export_options): Add "mode1003"
+	(secret_key_to_mode1003): New.
+	(receive_seckey_from_agent): Add arg mode1003.
+	(do_export_one_keyblock): Pass option down.
+
+	gpg: Remove a mostly duplicated function.
+	+ commit 1d88e14de751b19ae5637c4f6b0a1882c2f3b554
+	* g10/export.c (receive_seckey_from_agent): Add arg r_key.
+	(do_export_one_keyblock): Pass NULL for new arg.
+	(receive_raw_seckey_from_agent): Remove.
+	(export_secret_ssh_key): Use receive_seckey_from_agent.
+	* g10/keygen.c (card_store_key_with_backup): Pass NULL for new arg.
+
+2022-12-02  NIIBE Yutaka  <gniibe@fsij.org>
+
+	tests: Simplify fake-pinentry to use the option only.
+	+ commit 0a93b5b96a3bfcca52a8288e9847f06e495b461e
+	* tests/openpgp/fake-pinentry.c (parse_pinentry_user_data): New.
+	(main): Don't use PINENTRY_USER_DATA env var.
+
+	tests: Fix fake-pinentry for Windows.
+	+ commit 7c6b014d3bc6ea4237dd46c99f3a3d570796851b
+	* tests/openpgp/fake-pinentry.c (main): Override PINENTRY_USER_DATA,
+	by the option.
+
+	tests: Fix make check-all.
+	+ commit 7663fdd983d2ebc4a4f86e4f2ec6d518e036b90f
+	* Makefile.am (TESTS_ENVIRONMENT): Add GNUPG_IN_TEST_SUITE.
+
+2022-12-01  Werner Koch  <wk@gnupg.org>
+
+	agent: Fix import of protected v5 keys.
+	+ commit e094616cb75d7a4b551ae3db9ea1d5073e3237b6
+	* agent/cvt-openpgp.c (convert_from_openpgp_main): Take care of
+	version 5 keys.
+
+	gpgsm: Change default algo to AES-256.
+	+ commit 2d8ac55d26e70f34c75ae892d84db90454b23c79
+	* sm/gpgsm.c (DEFAULT_CIPHER_ALGO): Change.
+
+2022-12-01  NIIBE Yutaka  <gniibe@fsij.org>
+
+	tests: Put a workaround for semihosted environment.
+	+ commit 1b434111a18680a97e9997af71c261058cabc5fa
+	* tests/openpgp/defs.scm [*win32*]: Use --build-prefix option.
+
+	tests: More fix for semihosted environment.
+	+ commit 594c3274d669ddebd145bef33013a66d3e03e27d
+	* common/all-tests.scm: Conditionalize by *win32*.
+	* tests/cms/Makefile.am (GPGSM): Add missing GPGSM.
+	* tests/pkits/Makefile.am (TESTS_ENVIRONMENT): Add EXEEXT.
+
+	tests: Support semihosted environment.
+	+ commit f182c284fb2c093f8dbfc6a4b815762f36cc5217
+	* Makefile.am (check-all): Add EXEEXT.
+	* agent/all-tests.scm: Append EXEEXT.
+	* common/all-tests.scm: Likewise.
+	* g10/all-tests.scm: Likewise.
+	* g13/all-tests.scm: Likewise.
+
+	tests: Fix tests under cms.
+	+ commit a9a1ee8726335c28398b41d39a5881c0f9bcb5de
+	* tests/cms/all-tests.scm: Remove merge mistake.
+
+	tests,w32: Fix for semihosted environment.
+	+ commit e1e26a49bf2c8c74360594ced29286c7dca468e9
+	* tests/cms/Makefile.am (OLD_TESTS_ENVIRONMENT): Add EXEEXT.
+
+2022-11-30  NIIBE Yutaka  <gniibe@fsij.org>
+
+	w32: Fix for tests on semihosted environment.
+	+ commit 50c65153605042863fda59fe2ec837f1a7b14658
+	* Makefile.am (all-local): Make links with EXEEXT.
+
+	w32: Fix gnupg_unsetenv.
+	+ commit 8e8971403f7510f4d7c746fc0ffcdef73c0baf8b
+	* common/sysutils.c (gnupg_unsetenv): Don't use nonstandard extension
+	of "NAME", but "NAME=".
+
+2022-11-29  Werner Koch  <wk@gnupg.org>
+
+	wkd: New option --add-revocs and some fixes.
+	+ commit c3f9f2d497b174ceb12c2dde35225a6ba016c835
+	* tools/gpg-wks.h (opt): Add add_revocs.
+	* tools/wks-util.c (wks_get_key): Add arg 'binary'.
+	(wks_armor_key): New.
+	(wks_find_add_revocs): New.
+	(wks_cmd_install_key): Get key in binary mode and add revocations if
+	enabled.
+	* tools/gpg-wks-client.c (oAddRevocs): New.
+	(opts): Add --add-revocs.
+	(parse_arguments): Set option,
+	(command_send): Get key in binary mode, add revocations if enabled,
+	and explictly armor key.  Remove kludge to skip the Content-type line
+	in no_encrypt mode.
+
+	(mirror_one_keys_userid): Always filter the key to get rid of the
+	armor as received from dirmngr.  Add revocations from the local
+	keyring.
+
+	wkd: Make use of --debug extprog.
+	+ commit 34fafa50f19c708abc9119aa6369425c47317da5
+	* tools/wks-util.c (debug_gpg_invocation): New.
+	(get_key_status_cb): Enable debug output.
+	(wks_get_key): Show gpg invocation.
+	(wks_list_key): Ditto.
+	(wks_filter_uid): Ditto.
+
+2022-11-28  Werner Koch  <wk@gnupg.org>
+
+	gpg: New export-filter export-revocs.
+	+ commit c985b52e71a83d14099f00f80e3588bd3ad28b98
+	* g10/options.h (EXPORT_REVOCS): New.
+	* g10/export.c (export_select_filter): New.
+	(struct export_filter_attic_s): Add field.
+	(cleanup_export_globals): Cleanup.
+	(parse_export_options): Add option "export-revocs".
+	(parse_and_set_export_filter): Parse the select type.
+	(do_export_revocs): New.
+	(do_export_stream): Add a way to select things for export.
+
+2022-11-28  NIIBE Yutaka  <gniibe@fsij.org>
+
+	gpg: Fix double-free in gpg --card-edit.
+	+ commit a4698d0fb20a11bcb5f5e4485ee334af02b48ee1
+	* g10/card-util.c (change_name): Don't free ISONAME here.
+
+2022-11-28  Werner Koch  <wk@gnupg.org>
+
+	gpg: Make --require-compliance work with out --status-fd.
+	+ commit 2aacd843ad6bab248f7d2bfc727d44a7f95811e5
+	* g10/mainproc.c (proc_encrypted): Set complaince_de_vs also if
+	require-compliance is set.
+
+2022-11-25  Werner Koch  <wk@gnupg.org>
+
+	gpg: New option --list-filter.
+	+ commit 1324dc3490b02c4ff818655db1474c594f04e4ec
+	* g10/gpg.c (oListFilter): New.
+	(opts): Add --list-filter.
+	(main): Parse oListFilter.
+	* g10/keylist.c: Include init.h and recsel.h.
+	(struct list_filter_s, list_filter): New.
+	(release_list_filter): New.
+	(cleanup_keylist_globals): New.
+	(parse_and_set_list_filter): New.
+	(list_keyblock): Implement --list-filter type "select".
+
+	* g10/import.c (impex_filter_getval): Add scope support and new
+	property names "key-size", "algostr", "origin", "lastupd", and "url".
+
+	dirmngr: Silence ocsp debug output.
+	+ commit d70779bdc60c40c895dcdcb846c10a7b9703263b
+	* dirmngr/ocsp.c (check_signature_core): No debug output
+
+2022-11-24  NIIBE Yutaka  <gniibe@fsij.org>
+
+	tests: Fix to support --enable-all-tests and variants.
+	+ commit 1246e16432b4240ad81c0bd757d7458b609dfd96
+	* tests/gpgscm/tests.scm (test::scm): Add VARIANT argument.
+	(tests::new): Likewise.
+	(open-log-file, report): Support VARIANT.
+	* tests/gpgme/all-tests.scm (setup-c, setup-py): Follow the change.
+	* tests/cms/all-tests.scm: Likewise.
+	* tests/cms/run-tests.scm: Likewise.
+	* tests/migrations/all-tests.scm: Likewise.
+	* tests/migrations/run-tests.scm: Likewise.
+	* tests/openpgp/all-tests.scm: Likewise.
+	* tests/openpgp/run-tests.scm: Likewise.
+
+	tests:w32: Fix for non-dot file name for Windows.
+	+ commit 7071f3076287f2967ab512eed46b868970702fac
+	* tests/migrations/from-classic.scm (assert-migrated): Handle the case
+	on Windows.
+
+	tests:gpgscm:w32: Fix for GetTempPath.
+	+ commit 7fe524e1828ec80f1d776711614e5620a42779f8
+	* tests/gpgscm/ffi.c (do_get_temp_path): Remove the last backslash.
+
+	tests: Keep .log files in objdir.
+	+ commit 1372b17731872d6db732b7623b27ea3e90db6331
+	* tests/gpgscm/tests.scm (open-log-file): Keep the log file in objdir.
+
+	tests: Use 233 for invalid value of FD.
+	+ commit 7ab2e4386ffe6e435129f84860e1d90779268197
+	* tests/openpgp/issue2941.scm: Use 233.
+
+2022-11-18  NIIBE Yutaka  <gniibe@fsij.org>
+
+	w32: Fix gnupg_tmpfile for possible failure.
+	+ commit ce5bed2800e59d5866b60648ee6487e5fcb72012
+	* common/sysutils.c (gnupg_tmpfile): Use different value for next
+	attempt.
+
+2022-11-17  Werner Koch  <wk@gnupg.org>
+
+	scd: Redact --debug cardio output of a VERIFY APDU.
+	+ commit 9f7ff43672478b213582125a7d288c96c5bb73b9
+	* scd/apdu.c (pcsc_send_apdu) [DBG_CARD_IO]: Detect and redact a
+	VERIFY.
+	(send_apdu_ccid): Ditto.
+
+2022-11-16  NIIBE Yutaka  <gniibe@fsij.org>
+
+	common: Remove Windows CE support in common.
+	+ commit 18a3ce1c9bd767e88d426cf618441a3313888473
+	* common/Makefile.am (HAVE_W32CE_SYSTEM): Remove conditional build.
+	(common_sources): Remove exechelp-w32ce.c.
+	* common/asshelp.c [HAVE_W32CE_SYSTEM]: Remove the support.
+	* common/common-defs.h [HAVE_W32CE_SYSTEM]: Likewise.
+	* common/dotlock.c [HAVE_W32CE_SYSTEM]: Likewise.
+	* common/exechelp-posix.c [HAVE_W32CE_SYSTEM]: Likewise.
+	* common/exechelp-w32.c [HAVE_W32CE_SYSTEM]: Likewise.
+	* common/gettime.c [HAVE_W32CE_SYSTEM]: Likewise.
+	* common/exechelp-w32ce.c: Remove.
+	* po/POTFILES.in: Update to remove common/exechelp-w32ce.c.
+
+2022-11-15  Werner Koch  <wk@gnupg.org>
+
+	gpgsm: Fix colon outout of ECC encryption certificates.
+	+ commit f5c3f13609361dfeb03722161b1fc93f5a33dcae
+	* sm/keylist.c (print_capabilities): Add arg algo and use it to check
+	for ECC capabilities.
+	(list_cert_colon): Call with algo.
+
+	scd:nks: Fix ECC signing if key not given by keygrip.
+	+ commit 2c4757352da6363842887f786e3bc26f27a40591
+	* scd/app-nks.c (keygripstr_from_pk_file): Set r_algo if not in cache.
+
+	dirmngr: Fix verification of ECDSA signed CRLs.
+	+ commit 868dabb4027a03f4ce39be3c143b480bccde1a63
+	* dirmngr/crlcache.c (finish_sig_check): Use raw value for the data.
+
+2022-11-10  Werner Koch  <wk@gnupg.org>
+
+	agent: Allow trustlist on Windows in Unicode homedirs.
+	+ commit 80ccded0421e45098a839b713f38f709b7567a96
+	* agent/trustlist.c (agent_marktrusted): Use gnupg_access.
+
+	gpg: Fix verification of cleartext signatures with overlong lines.
+	+ commit 976e9d608367f481f21ab13ec6125dc8ab3ad345
+	* g10/armor.c (fake_packet): Indicate truncated lines by inserting a
+	formfeed.
+	(armor_filter): Replace assert by log_assert.
+
+2022-11-09  NIIBE Yutaka  <gniibe@fsij.org>
+
+	gpg: Move w32_system function.
+	+ commit 8afa9735a6968ccd4be4e22a98d5b775df0c695a
+	* g10/exec.h (w32_system): Not exposed.
+	* g10/exec.c (w32_system): Move to ...
+	* g10/photoid.c: here.
+
+2022-11-04  Werner Koch  <wk@gnupg.org>
+
+	gpg: New option --quick-update-pref.
+	+ commit d40d23b233f0b2e6fc25937f1632ac5b9d4f61e5
+	* g10/gpg.c (aQuickUpdatePref): New.
+	(opts): Add --quick-update-pref.
+	(main): Implement.
+	* g10/keyedit.c (keyedit_quick_update_pref): New.
+	(menu_set_preferences): Add arg 'unattended' and adjust caller.
+
+	gpg: New list-options show-pref and show-pref-verbose.
+	+ commit 811cfa34cb3e7166f0cf1f94565504dee21cd9f5
+	* g10/options.h (LIST_SHOW_PREF): New.
+	(LIST_SHOW_PREF_VERBOSE): New.
+	* g10/gpg.c (parse_list_options): Add new options.
+	* g10/keyedit.c (show_prefs): Factor code out to ...
+	* g10/keylist.c (show_preferences): new.
+	(list_keyblock_print): Call show_preferences.
+
+	tests: Add tests to check that OCB is only used for capable keys.
+	+ commit 1be272d04e767c467d4ad79ca3a1cb96ee9ce4e1
+	* tests/openpgp/samplekeys/ed25519-cv25519-sample-2.asc: New.
+	* tests/openpgp/samplekeys/ed25519-cv25519-sample-1.asc: Add AEAD
+	preference.
+	* tests/openpgp/defs.scm (tr:gpgstatus): New.
+	(create-legacy-gpghome): Also import .key private keys.
+	* tests/openpgp/encrypt.scm: Add OCB tests.
+
+2022-11-02  Werner Koch  <wk@gnupg.org>
+
+	gpg: Make --list-packets work w/o --no-armor for plain OCB packets.
+	+ commit 82c4f26b67e9eaaaae14e8d914fb6bb86dcbfb7e
+	* g10/armor.c (is_armored): Add PKT_ENCRYPTED_AEAD.
+
+	tests: Add symmetric decryption tests.
+	+ commit e284f62b1c6d710eb0c22cb2924a98350766ed5b
+	* tests/openpgp/decrypt-sym.scm: New.
+	* tests/openpgp/samplemsgs/enc-sym-cfb-1.asc: New.
+	* tests/openpgp/samplemsgs/enc-sym-cfb-2.asc: New.
+	* tests/openpgp/samplemsgs/enc-sym-ocb-1.asc: New.
+	* tests/openpgp/samplemsgs/enc-sym-ocb-2.asc: New.
+
+	tests: Add tr:assert-same function.
+	+ commit 9b24d8ab5018c20dc6c917b5a89b3b1fcda3e6f9
+	* tests/gpgscm/tests.scm (tr:assert-same-string): New.
+	* tests/openpgp/shell.scm: Option to drop into a REPL.
+
+	agent: Avoid blanks in the ssh key's comment.
+	+ commit bd612f23607d2c4d4adbe3a3ddc28a1711f5308b
+	* agent/command-ssh.c (card_key_available): Replace blanks.
+
+2022-11-02  NIIBE Yutaka  <gniibe@fsij.org>
+
+	build: Update m4 files.
+	+ commit 2c1aaed621918d3808e904a34ddcfcb79eb89d96
+	* m4/ksba.m4: Update from libksba master.
+	* m4/libassuan.m4: Update from libassuan master.
+	* m4/libgcrypt.m4: Update from libgcrypt master.
+	* m4/npth.m4: Update from npth master.
+	* m4/ntbtls.m4: Update from npth master.
+
+2022-10-31  Werner Koch  <wk@gnupg.org>
+
+	gpg: Merge --rfc4880bis features into --gnupg.
+	+ commit 4583f4fe2e11b3dd070066628c3f16776cc74f72
+	* g10/gpg.c (oRFC4880bis): Remove.
+	(opts): Make --rfc4880bis a Noop.
+	(compliance_options): Make rfc4880bis to gnupg.
+	(set_compliance_option): Remove rfc4880bis stuff.
+	(main): Ditto.  Note that this now activates the --mimemode option.
+	* g10/keygen.c (keygen_set_std_prefs): Remove rfc4880bis protection.
+	(keygen_upd_std_prefs): Always announce support for v5 keys.
+	(read_parameter_file): Activate the v4 and v5 keywords.
+
+	gpg: Allow only OCB for AEAD encryption.
+	+ commit 5a2cef801d3506bedd700db1a5d88b7a75c4083b
+	* g10/gpg.c (opts): New option--force-ocb as alias for force-aead.
+	Turn --aead-algo and --personal-aead-preferences into dummy options.
+	(build_list_md_test_algo, build_list_aead_algo_name): Remove.
+	(my_strusage): Remove output of AEAD algos.
+	(main): Remove code from the --aead options.
+	* g10/encrypt.c (encrypt_seskey): Make file local.
+	(use_aead): Remove requirement for rfc4880bis.  Always return
+	AEAD_ALGO_OCB.
+	* g10/main.h (DEFAULT_AEAD_ALGO): Removed unused macro.
+	* g10/misc.c (default_aead_algo): Remove.
+	* g10/pkclist.c (select_aead_from_pklist): Return AEAD_ALGO_OCB or 0.
+	(select_algo_from_prefs): Remove personal AEAD algo setting.
+	* g10/keygen.c (keygen_set_std_prefs): Remove AEAD preference option
+	parsing.
+	* g10/options.h (opt): Remove def_aead_algo and personal_aead_prefs.
+
+	gpg: New option --compatibility-flags.
+	+ commit 03f04dfb9a03f0b10dfd7e01ee06df7495b95667
+	* g10/gpg.c (oCompatibilityFlags): New.
+	(opts): Add option.
+	(compatibility_flags): New list.
+	(main): Set flags and print help.
+	* g10/options.h (opt): Add field compatibility_flags.
+
+2022-10-28  Werner Koch  <wk@gnupg.org>
+
+	gpgsm: Also announce AES256-CBC in signatures.
+	+ commit b71a14238dd2e2a62111cba492a494f562da3f6c
+	* sm/sign.c (gpgsm_sign): Add new capability.
+
+	gpg: Fix trusted introducer for user-ids with only the mbox.
+	+ commit 0ef54e644f1945337c5c492dbcad898baee83026
+	* g10/trustdb.c (check_regexp): Kludge to match user-ids with only an
+	mbox.
+
+	gpg: Import stray revocation certificates.
+	+ commit 7aaedfb10767c74f3e6868dd1563cbbf1282ab2f
+	* g10/kbnode.c (new_kbnode2): New.
+	* g10/import.c (delete_inv_parts): New arg r_otherrevsigs to store
+	misplaced revocations.
+	(import_revoke_cert): Allow to pass an entire list.
+	(import_one): Import revocations found by delete_inv_parts.
+
+2022-10-28  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent: Automatically convert to extended key format by KEYATTR.
+	+ commit ed6eb9019248dbbd36f16e5b412f5a115057bcfc
+	* agent/command.c (cmd_keyattr): Reject when disabled extended key
+	format.  Handle the case when key is in non-extended format.
+
+2022-10-25  Werner Koch  <wk@gnupg.org>
+
+	card: New commands "gpg" and "gpgsm".
+	+ commit 9c4691c73e9ebd0126cf4c456b83b6ad6eeaed74
+	* tools/gpg-card.c: Include exechelp.h
+	(cmd_gpg): New.
+	(enum cmdids): Add cmdGPG and cmdGPGSM.
+	(cmds): Add commands "gpg" and "gpgsm"
+	(dispatch_command, interactive_loop): Call them.
+
+	card: Also show fingerprints of known X.509 certificates.
+	+ commit f3198f9d705afe3cd26f4ee7ca42633e62fadc6a
+	* tools/gpg-card.c (list_one_kinfo): Show fpr.
+
+	scd:nks: Support non-ESIGN signing with the Signature Card v2.
+	+ commit 8361e13ef212f5be35b613084916b5ebad2714c6
+	* scd/app-nks.c (do_sign): Handle ECC for NKS cards
+
+	gpgsm: Allow ECC encryption keys with just keyAgreement specified.
+	+ commit 6bd0dd762c0d6b6860894152cb51e23b0a55bfba
+	* sm/certlist.c (cert_usage_p): Allow keyAgreement for ECC.
+	* sm/fingerprint.c (gpgsm_is_ecc_key): New.
+
+	gpgsm: Use macro constants for cert_usage_p.
+	+ commit 50efcf2eb0d158dd829f8cda90ac81d0b515d46d
+	* sm/certlist.c (USE_MODE_): New.  Use them for easier reading.
+
+2022-10-24  NIIBE Yutaka  <gniibe@fsij.org>
+
+	build: Update gpg-error.m4.
+	+ commit b9d05774f565a895a41764310308984a33be3c84
+	* m4/gpg-error.m4: Update from libgpg-error 1.46.
+
+2022-10-20  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent,common,dirmngr,tests,tools: Remove spawn PREEXEC argument.
+	+ commit de01fb8131fd8d11de50e21b7351af99a3515a94
+	* common/exechelp-posix.c (do_exec): Remove PREEXEC argument.
+	(gnupg_spawn_process): Likewise.
+	(gnupg_spawn_process_fd): Follow the change of do_exec.
+	(gnupg_spawn_process_detached): Likewise.
+	* common/exechelp-w32.c (gnupg_spawn_process): Remove PREEXEC.
+	* common/exechelp.h (gnupg_spawn_process): Remove PREEXEC.
+	* agent/genkey.c (do_check_passphrase_pattern): Follow the change.
+	* common/exectool.c (gnupg_exec_tool_stream): Likewise.
+	* dirmngr/ldap-wrapper.c (ldap_wrapper): Likewise.
+	* tests/gpgscm/ffi.c (do_spawn_process): Likewise.
+	* tools/gpgconf-comp.c (gc_component_check_options): Likewise.
+	(retrieve_options_from_program): Likewise.
+	* tools/gpgconf.c (show_versions_via_dirmngr): Likewise.
+	* tools/gpgtar-create.c (gpgtar_create): Likewise.
+	* tools/gpgtar-extract.c (gpgtar_extract): Likewise.
+	* tools/gpgtar-list.c (gpgtar_list): Likewise.
+
+2022-10-18  NIIBE Yutaka  <gniibe@fsij.org>
+
+	gpg: Move NETLIBS after GPG_ERROR_LIBS.
+	+ commit 0f13ccd0e070ef87380662fe54304a784fb2cd80
+	* g10/Makefile.am (LDADD): Remove NETLIBS.
+	(gpg_LDADD, gpgv_LDADD): Add NETLIBS after GPG_ERROR_LIBS.
+	((t_keydb_LDADD, t_keydb_get_keyblock_LDADD): Likewise.
+	(t_stutter_LDADD): Likewise.
+
+2022-10-14  NIIBE Yutaka  <gniibe@fsij.org>
+
+	gpg: Use GCRY_KDF_ONESTEP_KDF with newer libgcrypt in future.
+	+ commit cf2d52cfc3ee4e557bdd093a29dc6409c1000b1a
+	* g10/ecdh.c (derive_kek): Use GCRY_KDF_ONESTEP_KDF.
+
+	common,w32: Fix struct stat on Windows.
+	+ commit fe28e088a9c2d4945b720b045b4fa74d2de3d895
+	* common/sysutils.c [HAVE_W32_SYSTEM] (gnupg_stat): Select
+	appropriate structure.
+
+	agent,w32: Support Win32-OpenSSH emulation by gpg-agent.
+	+ commit c51139f2bc546c6bd4548e24a604f2178a2b8366
+	* agent/agent.h (start_command_handler_ssh_stream): New.
+	* agent/command-ssh.c (start_command_handler_ssh_stream): New.
+	* agent/gpg-agent.c (oWin32OpenSSHSupport): New.
+	(W32_DEFAILT_AGENT_PIPE_NAME): New.
+	(main): Add oWin32OpenSSHSupport support.
+	(win32_openssh_thread): New.
+	(handle_connections): Spawn win32_openssh_thread.
+	* configure.ac (NEED_GPGRT_VERSION): Require libgpg-error 1.46.
+
+	common: Don't use FD2INT for POSIX-only code.
+	+ commit 5f1ce6cef5fe2d4e0fa973316744f9a23af6a39c
+	* common/iobuf.c [!HAVE_W32_SYSTEM] (iobuf_get_filelength): Use fp.
+
+	dirmngr: Fix build with no LDAP support.
+	+ commit 7011286ce6e1fb56c2989fdafbd11b931c489faa
+	* dirmngr/server.c [USE_LDAP] (start_command_handler): Conditionalize.
+
 2022-10-13  Werner Koch  <wk@gnupg.org>
 
 	Release 2.3.8.
diff --git a/Makefile.am b/Makefile.am
index 76c298c..6a2508b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@
 # 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
@@ -131,24 +131,24 @@ all-local:
 	@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 ] && ln -sf ../tpm2d/$$i .; done; \
+             do [ -f ../tpm2d/$$i$(EXEEXT) ] && ln -sf ../tpm2d/$$i$(EXEEXT) .; done; \
 	 echo "created links to binaries" )
 
 
@@ -213,12 +213,13 @@ TESTS_ENVIRONMENT = \
 	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.
@@ -237,11 +238,26 @@ release:
 	 ./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 "/*" ;\
diff --git a/Makefile.in b/Makefile.in
index ea7cfe3..4c6d7cd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -470,7 +470,7 @@ top_srcdir = @top_srcdir@
 # 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
@@ -540,6 +540,7 @@ TESTS_ENVIRONMENT = \
 	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
 
 
@@ -1071,24 +1072,24 @@ all-local:
 	@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 ] && ln -sf ../tpm2d/$$i .; done; \
+             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
@@ -1140,7 +1141,7 @@ stowinstall:
 .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:
@@ -1155,11 +1156,26 @@ release:
 	 ./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 "/*" ;\
diff --git a/NEWS b/NEWS
index ef16f88..0c1e27d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,70 @@
+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)
 ------------------------------------------------
 
@@ -57,6 +124,7 @@ Noteworthy changes in version 2.3.8 (2022-10-13)
     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)
@@ -138,6 +206,7 @@ Noteworthy changes in version 2.3.7 (2022-07-11)
   * 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)
@@ -1465,6 +1534,12 @@ Noteworthy changes in version 2.3.0 (2021-04-07)
 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
diff --git a/README b/README
index 299bf10..3ee5cf4 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
                        The GNU Privacy Guard 2
                       =========================
-                            Version 2.3
+                            Version 2.4
 
           Copyright 1997-2019 Werner Koch
           Copyright 1998-2021 Free Software Foundation, Inc.
@@ -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/)
@@ -74,7 +74,7 @@
 
   You may run
 
-    gpgconf --list-dirs
+    gpgconf -L
 
   to view the directories used by GnuPG.
 
@@ -113,6 +113,31 @@
 
 * 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.
+
+  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
@@ -203,8 +228,7 @@
   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.
+  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
diff --git a/VERSION b/VERSION
index bc4abe8..197c4d5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.8
+2.4.0
diff --git a/agent/Makefile.am b/agent/Makefile.am
index fe2d7d2..4da1ea9 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -19,10 +19,8 @@
 
 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
@@ -66,11 +64,7 @@ gpg_agent_SOURCES = \
 
 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 +73,7 @@ gpg_agent_LDADD = $(commonpth_libs) \
                 $(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 = \
diff --git a/agent/Makefile.in b/agent/Makefile.in
index 626851e..e3f0fd3 100644
--- a/agent/Makefile.in
+++ b/agent/Makefile.in
@@ -124,11 +124,10 @@ POST_UNINSTALL = :
 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
-noinst_PROGRAMS = $(am__EXEEXT_3)
-@HAVE_DOSISH_SYSTEM_FALSE@am__append_2 = -DGNUPG_BINDIR="\"$(bindir)\""            \
+libexec_PROGRAMS = gpg-protect-tool$(EXEEXT) \
+	gpg-preset-passphrase$(EXEEXT)
+noinst_PROGRAMS = $(am__EXEEXT_2)
+@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 +138,15 @@ noinst_PROGRAMS = $(am__EXEEXT_3)
 # 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 = $(am__EXEEXT_2)
+@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 \
@@ -170,10 +169,8 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)"
-@HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_1 =  \
-@HAVE_W32CE_SYSTEM_FALSE@	gpg-preset-passphrase$(EXEEXT)
-am__EXEEXT_2 = t-protect$(EXEEXT)
-@DISABLE_TESTS_FALSE@am__EXEEXT_3 = $(am__EXEEXT_2)
+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 \
@@ -200,10 +197,8 @@ gpg_agent_LINK = $(CCLD) $(gpg_agent_CFLAGS) $(CFLAGS) \
 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) \
@@ -222,10 +217,10 @@ gpg_protect_tool_LINK = $(CCLD) $(gpg_protect_tool_CFLAGS) $(CFLAGS) \
 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@)
@@ -537,21 +532,11 @@ EXTRA_DIST = ChangeLog-2011 gpg-agent-w32info.rc all-tests.scm
 
 # 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
@@ -583,8 +568,7 @@ gpg_agent_SOURCES = \
 
 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)
 
@@ -593,7 +577,7 @@ gpg_agent_LDADD = $(commonpth_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 = \
 	protect-tool.c \
diff --git a/agent/agent.h b/agent/agent.h
index 30f3020..ee5c675 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -453,6 +453,7 @@ gpg_error_t ssh_search_control_file (ssh_control_file_t cf,
                                      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 --*/
diff --git a/agent/all-tests.scm b/agent/all-tests.scm
index 9376adf..0d4ddd7 100644
--- a/agent/all-tests.scm
+++ b/agent/all-tests.scm
@@ -27,9 +27,10 @@
    (parse-makefile-expand filename expander key))
 
  (map (lambda (name)
-	(test::binary #f
-		      (path-join "agent" name)
-		      (path-join (getenv "objdir") "agent" name)))
+        (let ((name-ext (string-append name (getenv "EXEEXT"))))
+	  (test::binary #f
+		        (path-join "agent" name-ext)
+		        (path-join (getenv "objdir") "agent" name-ext))))
       (parse-makefile-expand (in-srcdir "agent" "Makefile.am")
 			     (lambda (filename port key) (parse-makefile port key))
 			     "module_tests")))
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index ce2b5df..f237f93 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -2424,6 +2424,7 @@ card_key_available (ctrl_t ctrl, const struct card_key_info_s *keyinfo,
   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 +2443,10 @@ card_key_available (ctrl_t ctrl, const struct card_key_info_s *keyinfo,
           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);
@@ -3768,67 +3773,73 @@ get_client_info (gnupg_fd_t fd, struct peer_info_s *out)
 }
 
 
-/* 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);
 }
 
 
diff --git a/agent/command.c b/agent/command.c
index b820a55..c113cab 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1218,6 +1218,12 @@ cmd_keyattr (assuan_context_t ctx, char *line)
   if (ctrl->restricted)
     return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
 
+  if (!opt.enable_extended_key_format)
+    {
+      err = gpg_error (GPG_ERR_NOT_SUPPORTED);
+      goto leave;
+    }
+
   opt_delete = has_option (line, "--delete");
 
   line = skip_options (line);
@@ -1248,15 +1254,15 @@ cmd_keyattr (assuan_context_t ctx, char *line)
       const char *p;
 
       err = agent_raw_key_from_file (ctrl, grip, &s_key, &keymeta);
-      if (keymeta == NULL)      /* Not extended format? */
-        {
-          err = gpg_error (GPG_ERR_INV_DATA);
-          goto leave;
-        }
+      if (err)
+        goto leave;
 
       if (argc == 2)
         {
-          nve_t e = nvc_lookup (keymeta, argv[1]);
+          nve_t e = NULL;
+
+          if (keymeta)
+            e = nvc_lookup (keymeta, argv[1]);
 
           if (opt_delete)
             {
@@ -1275,6 +1281,9 @@ cmd_keyattr (assuan_context_t ctx, char *line)
         }
       else if (argc == 3)
         {
+          if (!keymeta)
+            keymeta = nvc_new_private_key ();
+
           err = nvc_set (keymeta, argv[1], argv[2]);
         key_attr_write:
           if (!err)
@@ -2615,7 +2624,7 @@ cmd_scd (assuan_context_t ctx, char *line)
       argc = split_fields (l, argv, DIM (argv));
 
       /* These commands are allowed.  */
-      if ((argc == 1 && !strcmp (argv[0], "SERIALNO"))
+      if ((argc >= 1 && !strcmp (argv[0], "SERIALNO"))
           || (argc == 2
               && !strcmp (argv[0], "GETINFO")
               && !strcmp (argv[1], "version"))
@@ -2926,7 +2935,7 @@ cmd_import_key (assuan_context_t ctx, char *line)
 
 
 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"
@@ -2934,9 +2943,10 @@ static const char hlp_export_key[] =
   "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)
 {
@@ -2949,7 +2959,7 @@ cmd_export_key (assuan_context_t ctx, char *line)
   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;
@@ -2960,6 +2970,10 @@ cmd_export_key (assuan_context_t ctx, char *line)
     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)
     {
@@ -2994,11 +3008,17 @@ cmd_export_key (assuan_context_t ctx, char *line)
     }
 
   /* 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)
@@ -4141,6 +4161,11 @@ command_has_option (const char *cmd, const char *cmdopt)
       if (!strcmp (cmdopt, "newsymkey"))
         return 1;
     }
+  else if (!strcmp (cmd, "EXPORT_KEY"))
+    {
+      if (!strcmp (cmdopt, "mode1003"))
+        return 1;
+    }
 
   return 0;
 }
diff --git a/agent/cvt-openpgp.c b/agent/cvt-openpgp.c
index 76932a7..d170fde 100644
--- a/agent/cvt-openpgp.c
+++ b/agent/cvt-openpgp.c
@@ -802,9 +802,10 @@ convert_from_openpgp_main (ctrl_t ctrl, gcry_sexp_t s_pgp, int dontcare_exist,
   if (!list)
     goto bad_seckey;
   value = gcry_sexp_nth_data (list, 1, &valuelen);
-  if (!value || valuelen != 1 || !(value[0] == '3' || value[0] == '4'))
+  if (!value || valuelen != 1
+      || !(value[0] == '3' || value[0] == '4' || value[0] == '5'))
     goto bad_seckey;
-  is_v4 = (value[0] == '4');
+  is_v4 = (value[0] == '4' || value[0] == '5');
 
   gcry_sexp_release (list);
   list = gcry_sexp_find_token (top_list, "protection", 0);
@@ -948,7 +949,7 @@ convert_from_openpgp_main (ctrl_t ctrl, gcry_sexp_t s_pgp, int dontcare_exist,
   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);
diff --git a/agent/genkey.c b/agent/genkey.c
index fc6ce0a..eb6791d 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -142,7 +142,7 @@ do_check_passphrase_pattern (ctrl_t ctrl, const char *pw, unsigned int flags)
   argv[i] = NULL;
   log_assert (i < sizeof argv);
 
-  if (gnupg_spawn_process (pgmname, argv, NULL, NULL, 0,
+  if (gnupg_spawn_process (pgmname, argv, NULL, 0,
                            &stream_to_check_pattern, NULL, NULL, &pid))
     result = 1; /* Execute error - assume password should no be used.  */
   else
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index fad2a36..412eb43 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -140,6 +140,7 @@ enum cmd_and_opt_values
   oSSHSupport,
   oSSHFingerprintDigest,
   oPuttySupport,
+  oWin32OpenSSHSupport,
   oDisableScdaemon,
   oDisableCheckOwnSocket,
   oS2KCount,
@@ -229,6 +230,13 @@ static gpgrt_opt_t opts[] = {
                 /* */           "@"
 #endif
                 ),
+  ARGPARSE_o_s (oWin32OpenSSHSupport, "enable-win32-openssh-support",
+#ifdef HAVE_W32_SYSTEM
+                /* */           N_("enable Win32-OpenSSH support")
+#else
+                /* */           "@"
+#endif
+                ),
   ARGPARSE_s_n (oDisableExtendedKeyFormat, "disable-extended-key-format", "@"),
   ARGPARSE_s_n (oEnableExtendedKeyFormat, "enable-extended-key-format", "@"),
   ARGPARSE_s_i (oListenBacklog, "listen-backlog", "@"),
@@ -357,6 +365,10 @@ static int putty_support;
    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
@@ -1289,6 +1301,15 @@ main (int argc, char **argv)
 #        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;
@@ -2756,6 +2777,99 @@ putty_message_thread (void *arg)
     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*/
 
 
@@ -2948,9 +3062,16 @@ handle_connections (gnupg_fd_t listen_fd,
 
       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*/
 
diff --git a/agent/trustlist.c b/agent/trustlist.c
index 250fcf2..4d23eb1 100644
--- a/agent/trustlist.c
+++ b/agent/trustlist.c
@@ -648,7 +648,7 @@ agent_marktrusted (ctrl_t ctrl, const char *name, const char *fpr, int flag)
   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);
diff --git a/am/cmacros.am b/am/cmacros.am
index e71bc4e..d6d466f 100644
--- a/am/cmacros.am
+++ b/am/cmacros.am
@@ -57,19 +57,6 @@ if GNUPG_DIRMNGR_LDAP_PGM
 AM_CPPFLAGS += -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
 endif
 
-# 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.
-if HAVE_W32CE_SYSTEM
-extra_sys_libs = -lcoredll6
-extra_bin_ldflags = -Wl,--stack=0x40000
-else
-extra_sys_libs =
-extra_bin_ldflags =
-endif
-
 if HAVE_W32_SYSTEM
 .rc.o:
 	$(WINDRES) $(DEFAULT_INCLUDES) $(INCLUDES) "$<" "$@"
diff --git a/autogen.sh b/autogen.sh
index 4b511bf..0abf103 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -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 @@ extraoptions=
 # 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 @@ amd64_toolprefixes=
 # 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 @@ case "$1" in
         myhost="w32"
         shift
         ;;
-    --build-w32ce)
-        myhost="w32"
-        myhostsub="ce"
-        shift
-        ;;
     --build-w64)
         myhost="w32"
         myhostsub="64"
@@ -274,12 +266,6 @@ fi
 # ******************
 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"
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index 00bfa1f..56e3172 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -141,6 +141,10 @@ help-wixlib:
 	@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 @@ STATIC=0
 # 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,AUTHENTICODE_CERTS))
 $(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 @@ AUTHENTICODE_FILES= \
                     gpg-agent.exe             \
                     gpg-connect-agent.exe     \
                     gpg-preset-passphrase.exe \
+                    gpg-check-pattern.exe     \
                     gpg-wks-client.exe        \
                     gpg.exe                   \
                     gpgconf.exe               \
@@ -884,14 +891,14 @@ endif
 # 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 +1017,13 @@ $(stampdir)/stamp-$(1)-00-unpack: $(stampdir)/stamp-directories
 	   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 ;;	   		\
@@ -1448,7 +1462,7 @@ define AUTHENTICODE_sign
      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) \
@@ -1535,9 +1549,10 @@ endif
 
 
 #
-# Check availibility of standard tools
+# Check availibility of standard tools and prepare everything.
 #
-check-tools:
+check-tools: $(stampdir)/stamp-directories
+
 
 
 #
diff --git a/common/Makefile.am b/common/Makefile.am
index f3fb60f..d5ab038 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -24,9 +24,7 @@ EXTRA_DIST = mkstrtable.awk exaudit.awk exstatus.awk ChangeLog-2011 \
 	     all-tests.scm
 
 noinst_LIBRARIES = libcommon.a libcommonpth.a libgpgrl.a
-if !HAVE_W32CE_SYSTEM
 noinst_LIBRARIES += libsimple-pwquery.a
-endif
 noinst_PROGRAMS = $(module_tests) $(module_maint_tests)
 if DISABLE_TESTS
 TESTS =
@@ -109,11 +107,7 @@ endif
 # To make the code easier to read we have split home some code into
 # separate source files.
 if HAVE_W32_SYSTEM
-if HAVE_W32CE_SYSTEM
-common_sources += exechelp-w32ce.c
-else
 common_sources += exechelp-w32.c
-endif
 else
 common_sources += exechelp-posix.c
 endif
@@ -132,11 +126,9 @@ 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)
 
-if !HAVE_W32CE_SYSTEM
 libsimple_pwquery_a_SOURCES = \
 	simple-pwquery.c simple-pwquery.h asshelp.c asshelp.h
 libsimple_pwquery_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS)
-endif
 
 libgpgrl_a_SOURCES = \
         gpgrlhelp.c
diff --git a/common/Makefile.in b/common/Makefile.in
index 276d74f..e4c8dcb 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -125,10 +125,9 @@ PRE_UNINSTALL = :
 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 @@ noinst_PROGRAMS = $(am__EXEEXT_3) $(am__EXEEXT_4)
 # 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 @@ am__libcommon_a_SOURCES_DIST = common-defs.h util.h utilproto.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 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 @@ am__objects_5 = libcommon_a-i18n.$(OBJEXT) \
 	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 @@ am__libcommonpth_a_SOURCES_DIST = common-defs.h util.h utilproto.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 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 @@ am__objects_11 = libcommonpth_a-i18n.$(OBJEXT) \
 	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 @@ am_libgpgrl_a_OBJECTS = gpgrlhelp.$(OBJEXT)
 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_sexputil_DEPENDENCIES = $(am__DEPENDENCIES_2)
 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_strlist_DEPENDENCIES = $(am__DEPENDENCIES_2)
 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 @@ am__depfiles_remade = ./$(DEPDIR)/gpgrlhelp.Po \
 	./$(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 @@ am__depfiles_remade = ./$(DEPDIR)/gpgrlhelp.Po \
 	./$(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 @@ SOURCES = $(libcommon_a_SOURCES) $(libcommonpth_a_SOURCES) \
 	$(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 @@ EXTRA_DIST = mkstrtable.awk exaudit.awk exstatus.awk ChangeLog-2011 \
 	     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 @@ common_sources = common-defs.h util.h utilproto.h fwddecl.h i18n.c \
 	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_SOURCES = $(common_sources) $(without_npth_sources)
 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 @@ libgpgrl_a_SOURCES = \
 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 @@ distclean-compile:
 @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 @@ distclean-compile:
 @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 @@ libcommon_a-w32-cmdline.obj: w32-cmdline.c
 @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 @@ libcommonpth_a-w32-cmdline.obj: w32-cmdline.c
 @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 @@ distclean: distclean-am
 	-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 @@ distclean: distclean-am
 	-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 @@ maintainer-clean: maintainer-clean-am
 	-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 @@ maintainer-clean: maintainer-clean-am
 	-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
diff --git a/common/all-tests.scm b/common/all-tests.scm
index 54f1153..7ff7d24 100644
--- a/common/all-tests.scm
+++ b/common/all-tests.scm
@@ -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"))
+	)))
diff --git a/common/asshelp.c b/common/asshelp.c
index 172c7d9..eb3e41b 100644
--- a/common/asshelp.c
+++ b/common/asshelp.c
@@ -54,15 +54,9 @@
 
 /* The time we wait until the agent or the dirmngr are ready for
    operation after we started them before giving up.  */
-#ifdef HAVE_W32CE_SYSTEM
-# define SECS_TO_WAIT_FOR_AGENT 30
-# define SECS_TO_WAIT_FOR_KEYBOXD 30
-# define SECS_TO_WAIT_FOR_DIRMNGR 30
-#else
-# define SECS_TO_WAIT_FOR_AGENT 5
-# define SECS_TO_WAIT_FOR_KEYBOXD 5
-# define SECS_TO_WAIT_FOR_DIRMNGR 5
-#endif
+#define SECS_TO_WAIT_FOR_AGENT 5
+#define SECS_TO_WAIT_FOR_KEYBOXD 5
+#define SECS_TO_WAIT_FOR_DIRMNGR 5
 
 /* A bitfield that specifies the assuan categories to log.  This is
    identical to the default log handler of libassuan.  We need to do
diff --git a/common/common-defs.h b/common/common-defs.h
index cad5405..ff3c65e 100644
--- a/common/common-defs.h
+++ b/common/common-defs.h
@@ -36,10 +36,6 @@
 #define getenv(a)  (NULL)
 #endif
 
-#ifdef HAVE_W32CE_SYSTEM
-#define getpid() GetCurrentProcessId ()
-#endif
-
 
 /*-- ttyio.c --*/
 void tty_private_set_rl_hooks (void (*init_stream) (FILE *),
diff --git a/common/dotlock.c b/common/dotlock.c
index 80d80de..ab0a5a6 100644
--- a/common/dotlock.c
+++ b/common/dotlock.c
@@ -209,8 +209,6 @@
      EXTSEP_S            - Separation string for file name suffixes.
                            Usually not redefined.
 
-     HAVE_W32CE_SYSTEM   - Currently only used by GnuPG.
-
    Note that there is a test program t-dotlock which has compile
    instructions at its end.  At least for SMBFS and CIFS it is
    important that 64 bit versions of stat are used; most programming
@@ -314,9 +312,6 @@
 # include "common-defs.h"
 # include "stringhelp.h"  /* For stpcpy and w32_strerror. */
 #endif
-#ifdef HAVE_W32CE_SYSTEM
-# include "utf8conv.h"  /* WindowsCE requires filename conversion.  */
-#endif
 
 #include "dotlock.h"
 
diff --git a/common/exechelp-posix.c b/common/exechelp-posix.c
index b4d10bf..fa61344 100644
--- a/common/exechelp-posix.c
+++ b/common/exechelp-posix.c
@@ -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 @@ get_all_open_fds (void)
 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 @@ do_exec (const char *pgmname, const char *argv[],
   /* 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 @@ gnupg_close_pipe (int fd)
 /* 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 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
       es_fclose (outfp);
       es_fclose (errfp);
       do_exec (pgmname, argv, inpipe[0], outpipe[1], errpipe[1],
-               except, preexec, flags);
+               except, flags);
       /*NOTREACHED*/
     }
 
@@ -594,7 +592,7 @@ gnupg_spawn_process_fd (const char *pgmname, const char *argv[],
     {
       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 @@ gnupg_spawn_process_detached (const char *pgmname, const char *argv[],
         for (i=0; envp[i]; i++)
           putenv (xstrdup (envp[i]));
 
-      do_exec (pgmname, argv, -1, -1, -1, NULL, NULL, 0);
+      do_exec (pgmname, argv, -1, -1, -1, NULL, 0);
 
       /*NOTREACHED*/
     }
diff --git a/common/exechelp-w32.c b/common/exechelp-w32.c
index 19cf85c..0034e03 100644
--- a/common/exechelp-w32.c
+++ b/common/exechelp-w32.c
@@ -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 @@ gnupg_close_pipe (int fd)
 /* 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 @@ gnupg_spawn_process (const char *pgmname, const char *argv[],
     nullhd[2] = ((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;
diff --git a/common/exechelp-w32ce.c b/common/exechelp-w32ce.c
deleted file mode 100644
index 3d68a01..0000000
--- a/common/exechelp-w32ce.c
+++ /dev/null
@@ -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))
-
-
-#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 buffer[4096];
-  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
-}
-
-
-
-/* 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)
-    array[0] = -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;
-          }
-        array[idx++] = fd;
-      }
-  array[idx] = -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 fdbuf[3*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 = argv[i]); 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; argv[i]; i++)
-    {
-      *p++ = ' ';
-      p = copy_quoted (p, argv[i]);
-    }
-
-  *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 filedes[2], int inherit_idx)
-{
-  HANDLE hd;
-  int rvid;
-
-  filedes[0] = filedes[1] = -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)
-    {
-      filedes[0] = handle_to_fd (hd);
-      filedes[1] = rvid;
-    }
-  else
-    {
-      filedes[0] = rvid;
-      filedes[1] = 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 filedes[2], 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 filedes[2], 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 filedes[2])
-{
-  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);
-    }
-}
diff --git a/common/exechelp.h b/common/exechelp.h
index 735ea47..3343fe5 100644
--- a/common/exechelp.h
+++ b/common/exechelp.h
@@ -133,7 +133,7 @@ void gnupg_close_pipe (int fd);
  */
 gpg_error_t
 gnupg_spawn_process (const char *pgmname, const char *argv[],
-                     int *execpt, void (*preexec)(void), unsigned int flags,
+                     int *execpt, unsigned int flags,
                      estream_t *r_infp,
                      estream_t *r_outfp,
                      estream_t *r_errfp,
diff --git a/common/exectool.c b/common/exectool.c
index 8013ba1..aaf5898 100644
--- a/common/exectool.c
+++ b/common/exectool.c
@@ -412,7 +412,7 @@ gnupg_exec_tool_stream (const char *pgmname, const char *argv[],
     exceptclose[0] = -1;
 
   err = gnupg_spawn_process (pgmname, argv,
-                             exceptclose, NULL, GNUPG_SPAWN_NONBLOCK,
+                             exceptclose, GNUPG_SPAWN_NONBLOCK,
                              input? &infp : NULL,
                              &outfp, &errfp, &pid);
   if (extrapipe[0] != -1)
diff --git a/common/gettime.c b/common/gettime.c
index 20d8fa1..2a9b717 100644
--- a/common/gettime.c
+++ b/common/gettime.c
@@ -708,11 +708,6 @@ asctimestamp (u32 stamp)
   /* NOTE: gcc -Wformat-noliteral will complain here.  I have found no
      way to suppress this warning.  */
   strftime (buffer, DIM(buffer)-1, fmt, tp);
-# elif defined(HAVE_W32CE_SYSTEM)
-  /* tzset is not available but %Z nevertheless prints a default
-     nonsense timezone ("WILDABBR").  Thus we don't print the time
-     zone at all.  */
-  strftime (buffer, DIM(buffer)-1, "%c", tp);
 # else
 #  if HAVE_W32_SYSTEM
   {
diff --git a/common/iobuf.c b/common/iobuf.c
index 3ec64dc..86bb296 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -2564,7 +2564,7 @@ iobuf_get_filelength (iobuf_t a, int *overflow)
     {
       struct stat st;
 
-      if ( !fstat (FD2INT (fp), &st) )
+      if ( !fstat (fp, &st) )
         return st.st_size;
       log_error("fstat() failed: %s\n", strerror(errno) );
     }
diff --git a/common/mapstrings.c b/common/mapstrings.c
index 172e198..9efe95c 100644
--- a/common/mapstrings.c
+++ b/common/mapstrings.c
@@ -154,6 +154,14 @@ map_static_macro_string (const char *string)
   membuf_t mb;
   char *p;
 
+  /* We use a hack if we don't use the fixed gpgrt 1.47
+   * (commit 885a287a57cf060b4c5b441822c09d23b8dee2bd) */
+#if GPGRT_VERSION_NUMBER < 0x012f00
+  if (string && !strncmp (string, "Project-Id-Version:", 19)
+      && strstr (string, "PO-Revision-Date:"))
+    return "";
+#endif
+
   if ((s = already_mapped (string)))
     return s;
   s = string;
diff --git a/common/sysutils.c b/common/sysutils.c
index c30f9a0..01510dd 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -609,7 +609,7 @@ gnupg_tmpfile (void)
   char *name, *p;
   HANDLE file;
   int pid = GetCurrentProcessId ();
-  unsigned int value;
+  unsigned int value = 0;
   int i;
   SECURITY_ATTRIBUTES sec_attr;
 
@@ -634,12 +634,9 @@ gnupg_tmpfile (void)
   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;
-        }
+	*p++ = tohex (((value >> (7 - i)*4) & 0x0f));
       strcpy (p, ".tmp");
       file = CreateFile (buffer,
                          GENERIC_READ | GENERIC_WRITE,
@@ -1195,19 +1192,28 @@ gnupg_unsetenv (const char *name)
 #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*/
 }
@@ -1237,10 +1243,20 @@ int
 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);
diff --git a/config.h.in b/config.h.in
index e723640..b9549b8 100644
--- a/config.h.in
+++ b/config.h.in
@@ -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
 
diff --git a/configure b/configure
index 9c7ea2e..aca916f 100755
--- a/configure
+++ b/configure
@@ -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.8.
+# Generated by GNU Autoconf 2.69 for gnupg 2.4.0.
 #
 # Report bugs to <https://bugs.gnupg.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='gnupg'
 PACKAGE_TARNAME='gnupg'
-PACKAGE_VERSION='2.3.8'
-PACKAGE_STRING='gnupg 2.3.8'
+PACKAGE_VERSION='2.4.0'
+PACKAGE_STRING='gnupg 2.4.0'
 PACKAGE_BUGREPORT='https://bugs.gnupg.org'
 PACKAGE_URL=''
 
@@ -745,8 +745,6 @@ GPGRT_CONFIG
 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 @@ if test "$ac_init_help" = "long"; then
   # 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.8 to adapt to many kinds of systems.
+\`configure' configures gnupg 2.4.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1628,7 +1626,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gnupg 2.3.8:";;
+     short | recursive ) echo "Configuration of gnupg 2.4.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1850,7 +1848,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gnupg configure 2.3.8
+gnupg configure 2.4.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2559,7 +2557,7 @@ cat >config.log <<_ACEOF
 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.8, which was
+It was created by gnupg $as_me 2.4.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2918,7 +2916,7 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-NEED_GPGRT_VERSION=1.41
+NEED_GPGRT_VERSION=1.46
 
 NEED_LIBGCRYPT_API=1
 NEED_LIBGCRYPT_VERSION=1.9.1
@@ -2927,7 +2925,7 @@ NEED_LIBASSUAN_API=2
 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 +3456,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gnupg'
- VERSION='2.3.8'
+ VERSION='2.4.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8124,7 +8122,6 @@ try_gettext=yes
 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 +8140,9 @@ $as_echo "#define USE_SIMPLE_GETTEXT 1" >>confdefs.h
         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 +8243,6 @@ if test "$have_w32_system" = yes; then
 
 $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 +8264,6 @@ else
   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
 
@@ -8498,6 +8475,10 @@ fi
         fi
         if test -n "$gpgrt_libdir"; then break; fi
       done
+      if test -z "$libdir_candidates"; then
+        # No valid pkgconfig dir in any of the system directories, fallback
+        gpgrt_libdir=${possible_libdir1}
+      fi
     else
       # When we cannot determine system libdir-format, use this:
       gpgrt_libdir=${possible_libdir1}
@@ -8617,7 +8598,7 @@ fi
   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
@@ -8841,7 +8822,7 @@ fi
   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
@@ -9053,7 +9034,7 @@ fi
   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
@@ -9645,7 +9626,7 @@ fi
   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
@@ -9869,7 +9850,7 @@ fi
   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
@@ -11156,9 +11137,6 @@ _ACEOF
 # Construct a printable name of the OS
 #
 case "${host}" in
-    *-mingw32ce*)
-        PRINTABLE_OS_NAME="W32CE"
-        ;;
     *-mingw32*)
         PRINTABLE_OS_NAME="MingW32"
         ;;
@@ -15273,11 +15251,7 @@ $as_echo "$as_me: WARNING:
 # 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
 
@@ -16538,7 +16512,7 @@ fi
 #
 # Provide information about the build.
 #
-BUILD_REVISION="6f12f952d"
+BUILD_REVISION="c0556edb8"
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16547,7 +16521,7 @@ _ACEOF
 
 
 BUILD_VERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./'`
-BUILD_VERSION="${BUILD_VERSION}28434"
+BUILD_VERSION="${BUILD_VERSION}49237"
 BUILD_FILEVERSION=`echo "${BUILD_VERSION}" | tr . ,`
 
 
@@ -16647,22 +16621,6 @@ $as_echo "$as_me:
 *** (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}:
@@ -16938,10 +16896,6 @@ if test -z "${HAVE_W32_SYSTEM_TRUE}" && test -z "${HAVE_W32_SYSTEM_FALSE}"; then
   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
@@ -17427,7 +17381,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # 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.8, which was
+This file was extended by gnupg $as_me 2.4.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17493,7 +17447,7 @@ _ACEOF
 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.8
+gnupg config.status 2.4.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -18514,7 +18468,7 @@ fi
 echo "
         GnuPG v${VERSION} has been configured as follows:
 
-        Revision:  6f12f952d  (28434)
+        Revision:  c0556edb8  (49237)
         Platform:  $PRINTABLE_OS_NAME ($host)
 
         OpenPGP:   $build_gpg
diff --git a/configure.ac b/configure.ac
index b043386..099c6a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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-2022 g10 Code GmbH
 #
 # This file is part of GnuPG.
 #
@@ -28,8 +28,8 @@ min_automake_version="1.16.3"
 # 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], [8])
+m4_define([mym4_minor], [4])
+m4_define([mym4_micro], [0])
 
 # To start a new development series, i.e a new major or minor number
 # you need to mark an arbitrary commit before the first beta release
@@ -54,7 +54,7 @@ AC_INIT([mym4_package],[mym4_version],[https://bugs.gnupg.org])
 # build-aux/speedo.mk, build-aux/getswdb.sh, and Makefile.am
 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 +63,7 @@ NEED_LIBASSUAN_API=2
 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
@@ -691,7 +691,6 @@ try_gettext=yes
 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 +709,7 @@ case "${host}" in
         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 +794,9 @@ AM_CONDITIONAL(USE_SIMPLE_GETTEXT, test x"$use_simple_gettext" = xyes)
 
 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 +1260,6 @@ AC_DEFINE_UNQUOTED(NAME_OF_SENDMAIL,"$SENDMAIL",
 # Construct a printable name of the OS
 #
 case "${host}" in
-    *-mingw32ce*)
-        PRINTABLE_OS_NAME="W32CE"
-        ;;
     *-mingw32*)
         PRINTABLE_OS_NAME="MingW32"
         ;;
@@ -1575,11 +1559,7 @@ GNUPG_CHECK_GNUMAKE
 # 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 +2044,6 @@ if test "$have_ksba" = "no"; then
 *** (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([[
diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
index 35fb1cf..1c8065d 100644
--- a/dirmngr/Makefile.am
+++ b/dirmngr/Makefile.am
@@ -93,7 +93,7 @@ dirmngr_LDADD = $(libcommonpth) \
 if USE_LDAP
 dirmngr_LDADD += $(ldaplibs) $(LBER_LIBS)
 endif
-dirmngr_LDFLAGS = $(extra_bin_ldflags)
+dirmngr_LDFLAGS =
 
 if USE_LDAP
 dirmngr_ldap_SOURCES = dirmngr_ldap.c ldap-misc.c ldap-misc.h $(ldap_url)
@@ -108,7 +108,7 @@ 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)
+dirmngr_client_LDFLAGS =
 
 
 t_common_src = t-support.h t-support.c
diff --git a/dirmngr/Makefile.in b/dirmngr/Makefile.in
index d51c0e3..40df9b7 100644
--- a/dirmngr/Makefile.in
+++ b/dirmngr/Makefile.in
@@ -696,16 +696,6 @@ 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)
-@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
@@ -735,7 +725,7 @@ 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)
+dirmngr_LDFLAGS = 
 @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 = 
@@ -748,7 +738,7 @@ dirmngr_client_LDADD = $(libcommon) \
                        $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
                        $(LIBGCRYPT_LIBS) $(NETLIBS) $(LIBINTL) $(LIBICONV)
 
-dirmngr_client_LDFLAGS = $(extra_bin_ldflags)
+dirmngr_client_LDFLAGS = 
 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) \
diff --git a/dirmngr/crlcache.c b/dirmngr/crlcache.c
index 45e0e6c..befc6b9 100644
--- a/dirmngr/crlcache.c
+++ b/dirmngr/crlcache.c
@@ -984,8 +984,8 @@ make_db_file_name (const char *issuer_hash)
 
 
 /* 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)
 {
@@ -1831,9 +1831,10 @@ finish_sig_check (ksba_crl_t crl, gcry_md_hd_t md, int algo,
       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 +1853,7 @@ finish_sig_check (ksba_crl_t crl, gcry_md_hd_t md, int algo,
   /* 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);
diff --git a/dirmngr/ldap-wrapper.c b/dirmngr/ldap-wrapper.c
index ac29de9..23d514c 100644
--- a/dirmngr/ldap-wrapper.c
+++ b/dirmngr/ldap-wrapper.c
@@ -855,7 +855,7 @@ ldap_wrapper (ctrl_t ctrl, ksba_reader_t *reader, const char *argv[])
     }
 
   err = gnupg_spawn_process (pgmname, arg_list,
-                             NULL, NULL, GNUPG_SPAWN_NONBLOCK,
+                             NULL, GNUPG_SPAWN_NONBLOCK,
                              NULL, &outfp, &errfp, &pid);
   if (err)
     {
diff --git a/dirmngr/ocsp.c b/dirmngr/ocsp.c
index 0da96ba..483b6f3 100644
--- a/dirmngr/ocsp.c
+++ b/dirmngr/ocsp.c
@@ -504,8 +504,11 @@ check_signature_core (ctrl_t ctrl, ksba_cert_t cert, gcry_sexp_t s_sig,
       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)
@@ -647,10 +650,13 @@ check_signature (ctrl_t ctrl,
 /* 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;
@@ -669,6 +675,12 @@ ocsp_isvalid (ctrl_t ctrl, ksba_cert_t cert, const char *cert_fpr,
   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)
@@ -839,8 +851,36 @@ ocsp_isvalid (ctrl_t ctrl, ksba_cert_t cert, const char *cert_fpr,
                       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)
     {
@@ -852,29 +892,19 @@ ocsp_isvalid (ctrl_t ctrl, ksba_cert_t cert, const char *cert_fpr,
                 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)
diff --git a/dirmngr/ocsp.h b/dirmngr/ocsp.h
index cfab7dd..b3deeac 100644
--- a/dirmngr/ocsp.h
+++ b/dirmngr/ocsp.h
@@ -23,7 +23,9 @@
 #define OCSP_H
 
 gpg_error_t ocsp_isvalid (ctrl_t ctrl, ksba_cert_t cert, const char *cert_fpr,
-                          int force_default_responder);
+                          int force_default_responder,
+                          gnupg_isotime_t r_revoked_at,
+                          const char **r_reason);
 
 /* Release the list of OCSP certificates hold in the CTRL object. */
 void release_ctrl_ocsp_certs (ctrl_t ctrl);
diff --git a/dirmngr/server.c b/dirmngr/server.c
index 04ebfd3..fba2233 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -1310,6 +1310,9 @@ cmd_isvalid (assuan_context_t ctx, char *line)
  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 +1320,12 @@ cmd_isvalid (assuan_context_t ctx, char *line)
       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)
@@ -1512,6 +1520,8 @@ cmd_checkocsp (assuan_context_t ctx, char *line)
   unsigned char fprbuffer[20], *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 +1557,18 @@ cmd_checkocsp (assuan_context_t ctx, char *line)
         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);
@@ -3137,8 +3153,10 @@ start_command_handler (assuan_fd_t fd, unsigned int session_id)
                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);
diff --git a/dirmngr/validate.c b/dirmngr/validate.c
index 231600f..399cca3 100644
--- a/dirmngr/validate.c
+++ b/dirmngr/validate.c
@@ -1164,7 +1164,7 @@ check_cert_sig (ksba_cert_t issuer_cert, ksba_cert_t cert)
   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);
diff --git a/doc/DETAILS b/doc/DETAILS
index 5c0c2bf..a3fe802 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -1504,6 +1504,14 @@ CREATE TABLE signatures (
          - 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.
@@ -1665,12 +1673,12 @@ Description of some debug flags:
 
 
 * Miscellaneous notes
-** List of useful RFCs
-  - RFC-1423 :: PEM, Part III: Algorithms, Modes, and Identifiers.
-  - RFC-1750 :: Randomness Recommendations for Security.
+** 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-2279 :: UTF-8, a transformation format of ISO 10646.
+  - RFC-2144 :: The CAST-128 Encryption Algorithm
+  - 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
@@ -1679,18 +1687,27 @@ Description of some debug flags:
   - 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-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 :: Elliptic Curve Cryptography (ECC) in OpenPGP
+  - RFC-6337 :: ECC in OpenPGP
   - 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
+
+  - draft-koch-openpgp-2015-rfc4880bis :: Updates to RFC-4880
 
 ** v3 fingerprints
    For packet version 3 we calculate the keyids this way:
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 42a0f13..d643244 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -464,16 +464,6 @@ 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)
-@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
diff --git a/doc/defsincdate b/doc/defsincdate
index fa5a8b7..2259004 100644
--- a/doc/defsincdate
+++ b/doc/defsincdate
@@ -1 +1 @@
-1665156944
+1671184884
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index aaa30ec..f555868 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -320,7 +320,7 @@ 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
+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
@@ -751,7 +751,7 @@ allow-ocsp
 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
diff --git a/doc/gnupg-card-architecture.pdf b/doc/gnupg-card-architecture.pdf
index bc2ffb6..7c095c6 100644
--- a/doc/gnupg-card-architecture.pdf
+++ b/doc/gnupg-card-architecture.pdf
diff --git a/doc/gnupg-module-overview.pdf b/doc/gnupg-module-overview.pdf
index 4bcadc3..4e94ab1 100644
--- a/doc/gnupg-module-overview.pdf
+++ b/doc/gnupg-module-overview.pdf
diff --git a/doc/gnupg-module-overview.png b/doc/gnupg-module-overview.png
index 5ff6476..adf3a27 100644
--- a/doc/gnupg-module-overview.png
+++ b/doc/gnupg-module-overview.png
diff --git a/doc/gnupg.info b/doc/gnupg.info
index a7d119b..0a03905 100644
--- a/doc/gnupg.info
+++ b/doc/gnupg.info
@@ -1,7 +1,7 @@
 This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
 
-This is the 'The GNU Privacy Guard Manual' (version 2.3.8-beta83,
-October 2022).
+This is the 'The GNU Privacy Guard Manual' (version 2.4.0, December
+2022).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 (C) 2013, 2014, 2015 Werner Koch.
@@ -23,205 +23,205 @@ END-INFO-DIR-ENTRY
 
 
 Indirect:
-gnupg.info-1: 990
-gnupg.info-2: 306427
-gnupg.info-3: 626498
+gnupg.info-1: 984
+gnupg.info-2: 303270
+gnupg.info-3: 629730
 
 Tag Table:
 (Indirect)
-Node: Top990
-Node: Installation2979
-Node: Invoking GPG-AGENT5328
-Node: Agent Commands7094
-Node: Agent Options8911
-Ref: option --options9191
-Ref: option --homedir9517
-Ref: option --log-file14589
-Ref: option --no-allow-mark-trusted14962
-Ref: option --no-user-trustlist15166
-Ref: option --allow-preset-passphrase15632
-Ref: option --no-allow-loopback-pinentry15785
-Ref: option --extra-socket24138
-Ref: option --enable-ssh-support25512
-Ref: option --ssh-fingerprint-digest27849
-Node: Agent Configuration29506
-Node: Agent Signals35305
-Node: Agent Examples36765
-Node: Agent Protocol37332
-Node: Agent PKDECRYPT39486
-Node: Agent PKSIGN41398
-Node: Agent GENKEY43702
-Node: Agent IMPORT45599
-Node: Agent EXPORT46043
-Node: Agent ISTRUSTED46258
-Node: Agent GET_PASSPHRASE48633
-Node: Agent CLEAR_PASSPHRASE51074
-Node: Agent PRESET_PASSPHRASE51465
-Node: Agent GET_CONFIRMATION52303
-Node: Agent HAVEKEY52975
-Node: Agent LEARN53607
-Node: Agent PASSWD53905
-Node: Agent UPDATESTARTUPTTY54371
-Node: Agent GETEVENTCOUNTER54849
-Node: Agent GETINFO55657
-Node: Agent OPTION56361
-Node: Invoking DIRMNGR59419
-Node: Dirmngr Commands60317
-Node: Dirmngr Options62686
-Ref: Dirmngr Options-Footnote-181259
-Node: Dirmngr Configuration81394
-Node: Dirmngr Signals86272
-Node: Dirmngr Examples87300
-Node: Dirmngr Protocol87982
-Node: Dirmngr LOOKUP88632
-Node: Dirmngr ISVALID90003
-Node: Dirmngr CHECKCRL92576
-Node: Dirmngr CHECKOCSP93633
-Node: Dirmngr CACHECERT94939
-Node: Dirmngr VALIDATE95778
-Node: Invoking GPG96346
-Node: GPG Commands97576
-Node: General GPG Commands98470
-Node: Operational GPG Commands99159
-Ref: option --export-ownertrust116460
-Node: OpenPGP Key Management119116
-Node: GPG Options142339
-Node: GPG Configuration Options143672
-Ref: gpg-option --options157123
-Ref: trust-model-tofu161691
-Node: GPG Key related Options181642
-Node: GPG Input and Output187963
-Node: OpenPGP Options201971
-Node: Compliance Options207774
-Node: GPG Esoteric Options211455
-Ref: GPG Esoteric Options-Footnote-1241552
-Node: Deprecated Options241706
-Node: GPG Configuration243209
-Node: GPG Examples249306
-Node: Unattended Usage of GPG258117
-Node: Programmatic use of GnuPG258748
-Node: Ephemeral home directories259299
-Node: The quick key manipulation interface260606
-Node: Unattended GPG key generation261193
-Node: Invoking GPGSM270512
-Node: GPGSM Commands271381
-Node: General GPGSM Commands271819
-Node: Operational GPGSM Commands272507
-Node: Certificate Management274541
-Node: GPGSM Options279987
-Node: Configuration Options280561
-Ref: gpgsm-option --options280830
-Node: Certificate Options284019
-Ref: gpgsm-option --validation-model287623
-Node: Input and Output288603
-Ref: option --p12-charset289186
-Ref: gpgsm-option --with-key-data290430
-Ref: gpgsm-option --with-validation290704
-Node: CMS Options291582
-Node: Esoteric Options292602
-Node: GPGSM Configuration299921
-Node: GPGSM Examples306427
-Node: Unattended Usage306624
-Node: Automated signature checking307215
-Node: CSR and certificate creation309038
-Node: GPGSM Protocol314697
-Node: GPGSM ENCRYPT315953
-Node: GPGSM DECRYPT318628
-Node: GPGSM SIGN319464
-Node: GPGSM VERIFY320920
-Node: GPGSM GENKEY321436
-Node: GPGSM LISTKEYS322451
-Ref: gpgsm-cmd listkeys322610
-Node: GPGSM EXPORT323363
-Node: GPGSM IMPORT324327
-Node: GPGSM DELETE325068
-Node: GPGSM GETAUDITLOG325575
-Ref: gpgsm-cmd getauditlog325744
-Node: GPGSM GETINFO326088
-Node: GPGSM OPTION326937
-Node: Invoking SCDAEMON330290
-Node: Scdaemon Commands330964
-Node: Scdaemon Options332092
-Node: Card applications341118
-Node: OpenPGP Card341783
-Node: NKS Card342256
-Node: DINSIG Card342582
-Node: PKCS#15 Card342958
-Node: Geldkarte Card343228
-Node: SmartCard-HSM343619
-Node: Undefined Card344215
-Node: Scdaemon Configuration344628
-Node: Scdaemon Examples345666
-Node: Scdaemon Protocol345849
-Node: Scdaemon SERIALNO347368
-Node: Scdaemon LEARN348214
-Node: Scdaemon READCERT349061
-Node: Scdaemon READKEY349463
-Node: Scdaemon PKSIGN349749
-Node: Scdaemon PKDECRYPT350475
-Node: Scdaemon GETATTR351225
-Node: Scdaemon SETATTR351427
-Node: Scdaemon WRITEKEY351632
-Node: Scdaemon GENKEY352334
-Node: Scdaemon RANDOM352537
-Node: Scdaemon PASSWD352760
-Node: Scdaemon CHECKPIN353151
-Node: Scdaemon RESTART354154
-Node: Scdaemon APDU354687
-Node: Specify a User ID355660
-Ref: how-to-specify-a-user-id355818
-Node: Trust Values360676
-Ref: trust-values360808
-Node: Smart Card Tool361413
-Node: gpg-card361759
-Node: Helper Tools391059
-Node: watchgnupg391916
-Ref: option watchgnupg --tcp393273
-Node: gpgv394937
-Node: addgnupghome400144
-Node: gpgconf400842
-Ref: gpgconf-Footnote-1403031
-Node: Invoking gpgconf403329
-Node: Format conventions410478
-Node: Listing components415811
-Node: Checking programs417896
-Node: Listing options420636
-Node: Changing options428134
-Node: Listing global options429838
-Node: Querying versions431820
-Node: Files used by gpgconf434520
-Node: applygnupgdefaults435128
-Node: gpg-preset-passphrase436000
-Node: Invoking gpg-preset-passphrase437037
-Node: gpg-connect-agent438441
-Node: Invoking gpg-connect-agent439157
-Node: Controlling gpg-connect-agent443805
-Node: dirmngr-client450332
-Node: gpgparsemail453685
-Node: gpgtar454000
-Node: gpg-check-pattern458803
-Node: Web Key Service461107
-Node: gpg-wks-client461420
-Node: gpg-wks-server466929
-Node: Howtos472351
-Node: Howto Create a Server Cert472623
-Node: System Notes481036
-Node: W32 Notes482247
-Node: Debugging482669
-Node: Debugging Tools483497
-Node: kbxutil483777
-Node: Debugging Hints485308
-Node: Common Problems486439
-Node: Architecture Details491676
-Node: Component interaction491986
-Ref: fig:moduleoverview492172
-Node: GnuPG-1 and GnuPG-2492279
-Ref: fig:cardarchitecture492569
-Node: Copying492684
-Node: Contributors530208
-Node: Glossary536463
-Node: Option Index538982
-Node: Environment Index626498
-Node: Index632237
+Node: Top984
+Node: Installation2967
+Node: Invoking GPG-AGENT5316
+Node: Agent Commands7082
+Node: Agent Options8900
+Ref: option --options9180
+Ref: option --homedir9506
+Ref: option --log-file14578
+Ref: option --no-allow-mark-trusted14951
+Ref: option --no-user-trustlist15155
+Ref: option --allow-preset-passphrase15641
+Ref: option --no-allow-loopback-pinentry15794
+Ref: option --extra-socket24157
+Ref: option --enable-ssh-support25531
+Ref: option --ssh-fingerprint-digest27868
+Node: Agent Configuration29525
+Node: Agent Signals35344
+Node: Agent Examples36804
+Node: Agent Protocol37371
+Node: Agent PKDECRYPT39525
+Node: Agent PKSIGN41437
+Node: Agent GENKEY43741
+Node: Agent IMPORT45638
+Node: Agent EXPORT46082
+Node: Agent ISTRUSTED46297
+Node: Agent GET_PASSPHRASE48672
+Node: Agent CLEAR_PASSPHRASE51113
+Node: Agent PRESET_PASSPHRASE51504
+Node: Agent GET_CONFIRMATION52342
+Node: Agent HAVEKEY53014
+Node: Agent LEARN53646
+Node: Agent PASSWD53944
+Node: Agent UPDATESTARTUPTTY54410
+Node: Agent GETEVENTCOUNTER54888
+Node: Agent GETINFO55696
+Node: Agent OPTION56400
+Node: Invoking DIRMNGR59458
+Node: Dirmngr Commands60356
+Node: Dirmngr Options62725
+Ref: Dirmngr Options-Footnote-181297
+Node: Dirmngr Configuration81432
+Node: Dirmngr Signals86310
+Node: Dirmngr Examples87338
+Node: Dirmngr Protocol88020
+Node: Dirmngr LOOKUP88670
+Node: Dirmngr ISVALID90041
+Node: Dirmngr CHECKCRL92614
+Node: Dirmngr CHECKOCSP93671
+Node: Dirmngr CACHECERT94977
+Node: Dirmngr VALIDATE95816
+Node: Invoking GPG96384
+Node: GPG Commands97614
+Node: General GPG Commands98508
+Node: Operational GPG Commands99197
+Ref: option --export-ownertrust116498
+Node: OpenPGP Key Management119153
+Node: GPG Options142979
+Node: GPG Configuration Options144312
+Ref: gpg-option --options157969
+Ref: trust-model-tofu162537
+Node: GPG Key related Options182514
+Node: GPG Input and Output188835
+Node: OpenPGP Options204655
+Node: Compliance Options210006
+Node: GPG Esoteric Options213687
+Ref: GPG Esoteric Options-Footnote-1243689
+Node: Deprecated Options243843
+Node: GPG Configuration245564
+Node: GPG Examples251671
+Node: Unattended Usage of GPG260482
+Node: Programmatic use of GnuPG261113
+Node: Ephemeral home directories261664
+Node: The quick key manipulation interface262971
+Node: Unattended GPG key generation263558
+Node: Invoking GPGSM272877
+Node: GPGSM Commands273746
+Node: General GPGSM Commands274184
+Node: Operational GPGSM Commands274872
+Node: Certificate Management276906
+Node: GPGSM Options282352
+Node: Configuration Options282926
+Ref: gpgsm-option --options283195
+Node: Certificate Options286384
+Ref: gpgsm-option --validation-model289988
+Node: Input and Output290968
+Ref: option --p12-charset291551
+Ref: gpgsm-option --with-key-data292795
+Ref: gpgsm-option --with-validation293069
+Node: CMS Options293947
+Node: Esoteric Options294967
+Node: GPGSM Configuration303270
+Node: GPGSM Examples308811
+Node: Unattended Usage309008
+Node: Automated signature checking309599
+Node: CSR and certificate creation311422
+Node: GPGSM Protocol317081
+Node: GPGSM ENCRYPT318337
+Node: GPGSM DECRYPT321012
+Node: GPGSM SIGN321848
+Node: GPGSM VERIFY323304
+Node: GPGSM GENKEY323820
+Node: GPGSM LISTKEYS324835
+Ref: gpgsm-cmd listkeys324994
+Node: GPGSM EXPORT325747
+Node: GPGSM IMPORT326711
+Node: GPGSM DELETE327452
+Node: GPGSM GETAUDITLOG327959
+Ref: gpgsm-cmd getauditlog328128
+Node: GPGSM GETINFO328472
+Node: GPGSM OPTION329321
+Node: Invoking SCDAEMON332674
+Node: Scdaemon Commands333348
+Node: Scdaemon Options334476
+Node: Card applications343502
+Node: OpenPGP Card344167
+Node: NKS Card344640
+Node: DINSIG Card344966
+Node: PKCS#15 Card345342
+Node: Geldkarte Card345612
+Node: SmartCard-HSM346003
+Node: Undefined Card346599
+Node: Scdaemon Configuration347012
+Node: Scdaemon Examples348130
+Node: Scdaemon Protocol348313
+Node: Scdaemon SERIALNO349842
+Node: Scdaemon LEARN350688
+Node: Scdaemon READCERT351535
+Node: Scdaemon READKEY351937
+Node: Scdaemon PKSIGN352223
+Node: Scdaemon PKDECRYPT352949
+Node: Scdaemon GETATTR353699
+Node: Scdaemon SETATTR353901
+Node: Scdaemon WRITEKEY354106
+Node: Scdaemon GENKEY354808
+Node: Scdaemon RANDOM355011
+Node: Scdaemon PASSWD355234
+Node: Scdaemon CHECKPIN355625
+Node: Scdaemon RESTART356628
+Node: Scdaemon APDU357161
+Node: Specify a User ID358134
+Ref: how-to-specify-a-user-id358292
+Node: Trust Values363150
+Ref: trust-values363282
+Node: Smart Card Tool363887
+Node: gpg-card364233
+Node: Helper Tools393535
+Node: watchgnupg394392
+Ref: option watchgnupg --tcp395749
+Node: gpgv397413
+Node: addgnupghome402620
+Node: gpgconf403318
+Ref: gpgconf-Footnote-1405507
+Node: Invoking gpgconf405805
+Node: Format conventions412954
+Node: Listing components418287
+Node: Checking programs420372
+Node: Listing options423112
+Node: Changing options430610
+Node: Listing global options432314
+Node: Querying versions434296
+Node: Files used by gpgconf436996
+Node: applygnupgdefaults437604
+Node: gpg-preset-passphrase438476
+Node: Invoking gpg-preset-passphrase439513
+Node: gpg-connect-agent440917
+Node: Invoking gpg-connect-agent441633
+Node: Controlling gpg-connect-agent446281
+Node: dirmngr-client452808
+Node: gpgparsemail456161
+Node: gpgtar456476
+Node: gpg-check-pattern461279
+Node: Web Key Service463583
+Node: gpg-wks-client463896
+Node: gpg-wks-server469742
+Node: Howtos475164
+Node: Howto Create a Server Cert475436
+Node: System Notes483849
+Node: W32 Notes485060
+Node: Debugging485482
+Node: Debugging Tools486310
+Node: kbxutil486590
+Node: Debugging Hints488121
+Node: Common Problems489252
+Node: Architecture Details494489
+Node: Component interaction494799
+Ref: fig:moduleoverview494985
+Node: GnuPG-1 and GnuPG-2495092
+Ref: fig:cardarchitecture495382
+Node: Copying495497
+Node: Contributors533021
+Node: Glossary539276
+Node: Option Index541795
+Node: Environment Index629730
+Node: Index635469
 
 End Tag Table
diff --git a/doc/gnupg.info-1 b/doc/gnupg.info-1
index d54b522..5a610b7 100644
--- a/doc/gnupg.info-1
+++ b/doc/gnupg.info-1
@@ -1,7 +1,7 @@
 This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
 
-This is the 'The GNU Privacy Guard Manual' (version 2.3.8-beta83,
-October 2022).
+This is the 'The GNU Privacy Guard Manual' (version 2.4.0, December
+2022).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 (C) 2013, 2014, 2015 Werner Koch.
@@ -27,8 +27,8 @@ File: gnupg.info,  Node: Top,  Next: Installation,  Up: (dir)
 Using the GNU Privacy Guard
 ***************************
 
-This is the 'The GNU Privacy Guard Manual' (version 2.3.8-beta83,
-October 2022).
+This is the 'The GNU Privacy Guard Manual' (version 2.4.0, December
+2022).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 (C) 2013, 2014, 2015 Werner Koch.
@@ -218,7 +218,7 @@ only one command is allowed.
      on Windows.
 
      If in 'common.conf' the option 'no-autostart' is set, any start
-     attemps will be ignored.
+     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
@@ -382,14 +382,14 @@ the two leading dashes, in the configuration file.
 
 '--no-user-trustlist'
      Entirely ignore the user trust list and consider only the global
-     trustlist ('/etc/gnupg/trustlist.txt').  This implies the *note
-     option --no-allow-mark-trusted::.
+     trustlist ('/usr/local/etc/gnupg/trustlist.txt').  This implies the
+     *note option --no-allow-mark-trusted::.
 
 '--sys-trustlist-name FILE'
      Changes the default name for the global trustlist from
      "trustlist.txt" to FILE.  If FILE does not contain any slashes and
      does not start with "~/" it is searched in the system configuration
-     directory ('/etc/gnupg').
+     directory ('/usr/local/etc/gnupg').
 
 '--allow-preset-passphrase'
      This option allows the use of 'gpg-preset-passphrase' to seed the
@@ -473,10 +473,10 @@ the two leading dashes, in the configuration file.
      entering a new passphrase matching one of these pattern a warning
      will be displayed.  If FILE does not contain any slashes and does
      not start with "~/" it is searched in the system configuration
-     directory ('/etc/gnupg').  The default is not to use any pattern
-     file.  The second version of this option is only used when creating
-     a new symmetric key to allow the use of different patterns for such
-     passphrases.
+     directory ('/usr/local/etc/gnupg').  The default is not to use any
+     pattern file.  The second version of this option is only used when
+     creating a new symmetric key to allow the use of different patterns
+     for such passphrases.
 
      Security note: It is known that checking a passphrase against a
      list of pattern or even against a complete dictionary is not very
@@ -750,10 +750,10 @@ agent.  By default they may all be found in the current home directory
      changed inadvertently.
 
      As a special feature a line 'include-default' will include a global
-     list of trusted certificates (e.g.  '/etc/gnupg/trustlist.txt').
-     This global list is also used if the local list is not available;
-     the *note option --no-user-trustlist:: enforces the use of only
-     this global list.
+     list of trusted certificates (e.g.
+     '/usr/local/etc/gnupg/trustlist.txt').  This global list is also
+     used if the local list is not available; the *note option
+     --no-user-trustlist:: enforces the use of only this global list.
 
      It is possible to add further flags after the 'S' for use by the
      caller:
@@ -815,9 +815,10 @@ agent.  By default they may all be found in the current home directory
      directory and take great care to keep this backup closed away.
 
    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 the a small
-helper script is provided to create these files (*note addgnupghome::).
+files into the directory '/usr/local/etc/skel/.gnupg' so that newly
+created users start up with a working configuration.  For existing users
+the a small helper script is provided to create these files (*note
+addgnupghome::).
 
 
 File: gnupg.info,  Node: Agent Signals,  Next: Agent Examples,  Prev: Agent Configuration,  Up: Invoking GPG-AGENT
@@ -1754,7 +1755,7 @@ off the two leading dashes.
      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
+     no 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
@@ -2127,7 +2128,7 @@ line:
    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:
+the other components:
 
      gpgconf --kill dirmngr
 
@@ -2885,8 +2886,8 @@ File: gnupg.info,  Node: Operational GPG Commands,  Next: OpenPGP Key Management
      COUNT is not given or zero, an endless sequence of random bytes
      will be emitted.  If used with '--armor' the output will be base64
      encoded.  The special level 16 uses a quality level of 1 and
-     outpust end endless stream of hex-encoded octets.  The special
-     level 30 outputs random as 30 zBase-32 characters.
+     outputs an endless stream of hex-encoded octets.  The special level
+     30 outputs random as 30 zBase-32 characters.
 
 '--gen-prime MODE BITS'
      Use the source, Luke :-).  The output format is subject to change
@@ -3176,7 +3177,9 @@ This section explains the main commands for key management.
           'gpg --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.
+          user IDs so these preferences will not be used by GnuPG. Note
+          that an unattended version of this command is available as
+          '--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
@@ -3384,6 +3387,15 @@ This section explains the main commands for key management.
      user ID flag is removed from all other user ids and the timestamp
      of all affected self-signatures is set one second ahead.
 
+'--quick-update-pref USER-ID'
+     This command updates the preference list of the key to the current
+     default value (either built-in or set via
+     '--default-preference-list').  This is the unattended version of of
+     using "setpref" in the '--key-edit' menu without giving a list.
+     Note that you can show the preferences in a key listing by using
+     '--list-options show-pref' or '--list-options show-pref-verbose'.
+     You should also re-distribute updated keys to your peers.
+
 '--change-passphrase USER-ID'
 '--passwd USER-ID'
      Change the passphrase of the secret key belonging to the
@@ -3494,6 +3506,11 @@ usually found in the option file.
      Assume "no" on most questions.  Should not be used in an option
      file.
 
+'--list-filter {select=EXPR}'
+     A list filter can be used to output only certain keys during key
+     listing commands.  For the available property names, see the
+     description of '--import-filter'.
+
 '--list-options PARAMETERS'
      This is a space or comma delimited string that gives options used
      when listing keys and signatures (that is, '--list-keys',
@@ -3845,16 +3862,16 @@ usually found in the option file.
           This is the standard Web of Trust as introduced by PGP 2.
 
      tofu
-          TOFU stands for Trust On First Use.  In this 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 displayed describing the
-          conflict, why it might have occurred (either the user
-          generated a new key and failed to cross sign the old and new
-          keys, the key is forgery, or a man-in-the-middle attack is
-          being attempted), and the user is prompted to manually confirm
-          the validity of the key in question.
+          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 displayed
+          describing the conflict, why it might have occurred (either
+          the user generated a new key and failed to cross sign the old
+          and new keys, the key is forgery, or a man-in-the-middle
+          attack is being attempted), and the user is prompted to
+          manually confirm the validity of the key in question.
 
           Because a potential attacker is able to control the email
           address and thereby circumvent the conflict detection
@@ -3895,11 +3912,11 @@ usually found in the option file.
           is returned.
 
      tofu+pgp
-          This 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: 'unknown < undefined < marginal < fully <
-          ultimate < expired < never'.
+          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: 'unknown < undefined < marginal
+          < fully < ultimate < expired < never'.
 
           By setting '--tofu-default-policy=unknown', this model can be
           used to implement the web of trust with TOFU's conflict
@@ -4124,7 +4141,7 @@ usually found in the option file.
      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.
 
 '--completes-needed N'
      Number of completely trusted users to introduce a new key signer
@@ -4563,9 +4580,19 @@ File: gnupg.info,  Node: GPG Input and Output,  Next: OpenPGP Options,  Prev: GP
           Self-signatures are not considered.  Currently only
           implemented for -import-filter.
 
+     select
+          This filter is only implemented by '--list-filter'.  All
+          property names may be used.
+
      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.
+     actual filter type and are indicated in the following table.  Note
+     that all property names may also be used by '--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:
 
@@ -4576,10 +4603,18 @@ File: gnupg.info,  Node: GPG Input and Output,  Next: OpenPGP Options,  Prev: GP
           The addr-spec part of a user id with mailbox or the empty
           string.  (keep-uid)
 
+     algostr
+          A string with the key algorithm description.  For example
+          "rsa3072" or "ed25519".
+
      key_algo
           A number with the public key algorithm of a key or subkey
           packet.  (drop-subkey)
 
+     key_size
+          A number with the effective key size of a key or subkey
+          packet.  (drop-subkey)
+
      key_created
      key_created_d
           The first is the timestamp a public key or subkey packet was
@@ -4603,8 +4638,7 @@ File: gnupg.info,  Node: GPG Input and Output,  Next: OpenPGP Options,  Prev: GP
           (drop-subkey) has been revoked.
 
      disabled
-          Boolean indicating whether a primary key is disabled.  (not
-          used)
+          Boolean indicating whether a primary key is disabled.
 
      secret
           Boolean indicating whether a key or subkey is a secret one.
@@ -4630,6 +4664,18 @@ File: gnupg.info,  Node: GPG Input and Output,  Next: OpenPGP Options,  Prev: GP
           A number with the digest algorithm of a signature packet.
           (drop-sig)
 
+     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.
+
+     lastupd
+          The timestamp the key was last updated from a keyserver or the
+          Web Key Directory.
+
+     url
+          A string with the the URL associated wit the last key lookup.
+
 '--export-options PARAMETERS'
      This is a space or comma delimited string that gives options for
      exporting keys.  Options can be prepended with a 'no-' to give the
@@ -4674,12 +4720,27 @@ File: gnupg.info,  Node: GPG Input and Output,  Next: OpenPGP Options,  Prev: GP
           "minimize" before export except that the local copy of the key
           is not modified.  Defaults to no.
 
+     export-revocs
+          Export only standalone revocation certificates of the key.
+          This option does not export revocations of 3rd party
+          certificate revocations.
+
      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.
 
+     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.
+
 '--with-colons'
      Print key listings delimited by colons.  Note that the output will
      be encoded in UTF-8 regardless of any '--display-charset' setting.
@@ -4757,10 +4818,12 @@ File: gnupg.info,  Node: OpenPGP Options,  Next: Compliance Options,  Prev: GPG
 '--no-force-v4-certs'
      These options are obsolete and have no effect since GnuPG 2.1.
 
+'--force-ocb'
 '--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 '--aead-algo' and '--chunk-size'.
+     MDC method.  '--force-aead' is an alias and deprecated.  See also
+     option '--chunk-size'.
 
 '--force-mdc'
 '--disable-mdc'
@@ -4799,15 +4862,6 @@ File: gnupg.info,  Node: OpenPGP Options,  Next: Compliance Options,  Prev: GPG
      most highly ranked cipher in this list is also used for the
      '--symmetric' encryption command.
 
-'--personal-aead-preferences STRING'
-     Set the list of personal AEAD preferences to STRING.  Use 'gpg
-     --version' to get a list of available algorithms, and use '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
-     '--symmetric' encryption command.
-
 '--personal-digest-preferences STRING'
      Set the list of personal digest preferences to STRING.  Use 'gpg
      --version' to get a list of available algorithms, and use 'none' to
@@ -4952,6 +5006,14 @@ File: gnupg.info,  Node: GPG Esoteric Options,  Next: Deprecated Options,  Prev:
 '--interactive'
      Prompt before overwriting any files.
 
+'--compatibility-flags FLAGS'
+     Set compatibility flags to work around problems due to
+     non-compliant keys 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:
@@ -5153,15 +5215,6 @@ File: gnupg.info,  Node: GPG Esoteric Options,  Next: Deprecated Options,  Prev:
      '--personal-cipher-preferences' is the safe way to accomplish the
      same thing.
 
-'--aead-algo NAME'
-     Specify that the AEAD algorithm NAME is to be used.  This is useful
-     for symmetric encryption where no key preference are available to
-     select the AEAD algorithm.  Running 'gpg' with 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 '--personal-aead-preferences' is the safe way
-     to accomplish the same thing.
-
 '--digest-algo NAME'
      Use NAME as the message digest algorithm.  Running the program with
      the command '--version' yields a list of supported algorithms.  In
@@ -5637,6 +5690,14 @@ File: gnupg.info,  Node: Deprecated Options,  Prev: GPG Esoteric Options,  Up: G
      [no-]show-policy-url' and/or '--verify-options
      [no-]show-policy-url' instead.
 
+'--personal-aead-preferences STRING'
+     This option is deprecated and has no more effect since version
+     2.3.9.
+
+'--aead-algo NAME'
+     This option is deprecated and has no more effect since version
+     2.3.9.
+
 
 File: gnupg.info,  Node: GPG Configuration,  Next: GPG Examples,  Prev: GPG Options,  Up: Invoking GPG
 
@@ -5660,9 +5721,10 @@ directory (*note option --homedir::).
      current main use is for the "use-keyboxd" option.
 
    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::).
+files into the directory '/usr/local/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 'gpg' creates and maintains a few other files;
 They all live in the current home directory (*note option --homedir::).
@@ -7017,118 +7079,3 @@ File: gnupg.info,  Node: Esoteric Options,  Prev: CMS Options,  Up: GPGSM Option
    All the long options may also be given in the configuration file
 after stripping off the two leading dashes.
 
-
-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.  '/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.  '/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'.
-
diff --git a/doc/gnupg.info-2 b/doc/gnupg.info-2
index c8e2f0e..92f67e0 100644
--- a/doc/gnupg.info-2
+++ b/doc/gnupg.info-2
@@ -1,7 +1,7 @@
 This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
 
-This is the 'The GNU Privacy Guard Manual' (version 2.3.8-beta83,
-October 2022).
+This is the 'The GNU Privacy Guard Manual' (version 2.4.0, December
+2022).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 (C) 2013, 2014, 2015 Werner Koch.
@@ -22,6 +22,122 @@ START-INFO-DIR-ENTRY
 END-INFO-DIR-ENTRY
 
 
+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'.
+
+
 File: gnupg.info,  Node: GPGSM Examples,  Next: Unattended Usage,  Prev: GPGSM Configuration,  Up: Invoking GPGSM
 
 5.4 Examples
@@ -1027,7 +1143,8 @@ home directory (*note option --homedir::).
 '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
@@ -1055,7 +1172,7 @@ accounts are hosted on the machine.
 
    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.
@@ -1600,9 +1717,9 @@ interactive mode is also supported.
 
 '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.
@@ -1674,7 +1791,7 @@ interactive mode is also supported.
      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
@@ -4236,6 +4353,13 @@ sub-domains is used here.
      addrspec, e.g.  "postel@isi.edu") per line.  Empty lines and lines
      starting with a '#' are ignored.
 
+'--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.
+
 '--verbose'
      Enable extra informational output.
 
@@ -5820,12 +5944,11 @@ Option Index
 * --no-history <1>:                      Invoking gpg-connect-agent.
                                                               (line  82)
 * --override-compliance-check:           GPG Esoteric Options.
-                                                              (line 460)
+                                                              (line 459)
+* add-revocs:                            gpg-wks-client.      (line 125)
 * add-servers:                           Dirmngr Options.     (line 313)
-* aead-algo:                             GPG Esoteric Options.
-                                                              (line 223)
 * agent-program:                         GPG Configuration Options.
-                                                              (line 741)
+                                                              (line 746)
 * agent-program <1>:                     Configuration Options.
                                                               (line  55)
 * agent-program <2>:                     gpg-card.            (line  64)
@@ -5834,50 +5957,50 @@ Option Index
 * allow-admin:                           Scdaemon Options.    (line 176)
 * allow-emacs-pinentry:                  Agent Options.       (line 189)
 * allow-freeform-uid:                    GPG Esoteric Options.
-                                                              (line 395)
+                                                              (line 394)
 * allow-loopback-pinentry:               Agent Options.       (line 171)
 * allow-non-selfsigned-uid:              GPG Esoteric Options.
-                                                              (line 390)
+                                                              (line 389)
 * allow-ocsp:                            Dirmngr Options.     (line 334)
 * allow-old-cipher-algos:                GPG Esoteric Options.
-                                                              (line 431)
+                                                              (line 430)
 * allow-preset-passphrase:               Agent Options.       (line 166)
 * allow-secret-key-import:               GPG Esoteric Options.
-                                                              (line 601)
+                                                              (line 600)
 * allow-version-check:                   Dirmngr Options.     (line 138)
 * allow-weak-digest-algos:               GPG Esoteric Options.
-                                                              (line 439)
+                                                              (line 438)
 * allow-weak-key-signatures:             GPG Esoteric Options.
-                                                              (line 455)
+                                                              (line 454)
 * always-trust:                          Deprecated Options.  (line  21)
 * 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 560)
 * ask-cert-level:                        GPG Configuration Options.
-                                                              (line 358)
+                                                              (line 363)
 * ask-sig-expire:                        GPG Esoteric Options.
-                                                              (line 547)
+                                                              (line 546)
 * 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 115)
 * attribute-file:                        GPG Esoteric Options.
-                                                              (line 113)
+                                                              (line 121)
 * authenticate:                          gpg-card.            (line  94)
 * auto-check-trustdb:                    GPG Configuration Options.
-                                                              (line 728)
+                                                              (line 733)
 * auto-expand-secmem:                    Agent Options.       (line 437)
 * auto-issuer-key-retrieve:              Certificate Options. (line  62)
 * auto-key-import:                       GPG Configuration Options.
-                                                              (line 573)
+                                                              (line 578)
 * auto-key-locate:                       GPG Configuration Options.
-                                                              (line 507)
+                                                              (line 512)
 * auto-key-retrieve:                     GPG Configuration Options.
-                                                              (line 585)
+                                                              (line 590)
 * base64:                                Input and Output.    (line  11)
 * batch:                                 Agent Options.       (line  48)
 * batch <1>:                             GPG Configuration Options.
@@ -5885,9 +6008,9 @@ Option Index
 * batch <2>:                             gpgtar.              (line 104)
 * blacklist:                             gpg-wks-client.      (line 119)
 * bzip2-compress-level:                  GPG Configuration Options.
-                                                              (line 332)
+                                                              (line 337)
 * bzip2-decompress-lowmem:               GPG Configuration Options.
-                                                              (line 342)
+                                                              (line 347)
 * c:                                     Dirmngr Options.     (line  87)
 * cache-cert:                            dirmngr-client.      (line  72)
 * cafpr:                                 gpg-card.            (line 102)
@@ -5901,13 +6024,13 @@ Option Index
                                                               (line 216)
 * card-timeout:                          Scdaemon Options.    (line 160)
 * cert-digest-algo:                      GPG Esoteric Options.
-                                                              (line 263)
+                                                              (line 262)
 * cert-notation:                         GPG Esoteric Options.
-                                                              (line 139)
+                                                              (line 147)
 * cert-policy-url:                       GPG Esoteric Options.
-                                                              (line 175)
+                                                              (line 183)
 * change-passphrase:                     OpenPGP Key Management.
-                                                              (line 472)
+                                                              (line 483)
 * change-passphrase <1>:                 Certificate Management.
                                                               (line 120)
 * change-pin:                            Operational GPG Commands.
@@ -5922,7 +6045,7 @@ Option Index
 * check-trustdb:                         Operational GPG Commands.
                                                               (line 349)
 * chuid:                                 GPG Esoteric Options.
-                                                              (line 653)
+                                                              (line 652)
 * chuid <1>:                             Esoteric Options.    (line   7)
 * chuid <2>:                             gpg-card.            (line  75)
 * chuid <3>:                             Invoking gpgconf.    (line 141)
@@ -5931,7 +6054,7 @@ Option Index
 * chunk-size:                            GPG Input and Output.
                                                               (line  29)
 * cipher-algo:                           GPG Esoteric Options.
-                                                              (line 214)
+                                                              (line 222)
 * cipher-algo <1>:                       CMS Options.         (line  13)
 * clear-sign:                            Operational GPG Commands.
                                                               (line  17)
@@ -5939,20 +6062,22 @@ Option Index
                                                               (line  18)
 * cms:                                   gpgtar.              (line  99)
 * command-fd:                            GPG Esoteric Options.
-                                                              (line 378)
+                                                              (line 377)
 * command-file:                          GPG Esoteric Options.
-                                                              (line 385)
+                                                              (line 384)
 * comment:                               GPG Esoteric Options.
-                                                              (line 118)
-* compatibility-flags:                   Esoteric Options.    (line  66)
+                                                              (line 126)
+* compatibility-flags:                   GPG Esoteric Options.
+                                                              (line  22)
+* compatibility-flags <1>:               Esoteric Options.    (line  66)
 * compliance:                            Compliance Options.  (line  60)
 * compliance <1>:                        Esoteric Options.    (line  27)
 * compliant-needed:                      GPG Configuration Options.
-                                                              (line 703)
+                                                              (line 708)
 * compress-algo:                         GPG Esoteric Options.
-                                                              (line 240)
+                                                              (line 239)
 * compress-level:                        GPG Configuration Options.
-                                                              (line 332)
+                                                              (line 337)
 * connect-quick-timeout:                 Dirmngr Options.     (line 125)
 * connect-timeout:                       Dirmngr Options.     (line 125)
 * create:                                gpgtar.              (line  16)
@@ -5968,30 +6093,30 @@ Option Index
 * debug:                                 Agent Options.       (line  82)
 * debug <1>:                             Dirmngr Options.     (line  59)
 * debug <2>:                             GPG Esoteric Options.
-                                                              (line  47)
+                                                              (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 <2>:                         GPG Esoteric Options.
-                                                              (line  54)
+                                                              (line  62)
 * debug-all <3>:                         Esoteric Options.    (line 109)
 * debug-all <4>:                         Scdaemon Options.    (line  76)
 * 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 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 <2>:                       GPG Esoteric Options.
-                                                              (line  22)
+                                                              (line  30)
 * debug-level <3>:                       Esoteric Options.    (line  74)
 * debug-level <4>:                       Scdaemon Options.    (line  40)
 * debug-log-tid:                         Scdaemon Options.    (line  99)
@@ -6014,24 +6139,24 @@ Option Index
 * default-cache-ttl:                     Agent Options.       (line 200)
 * default-cache-ttl <1>:                 Agent Options.       (line 209)
 * default-cert-expire:                   GPG Esoteric Options.
-                                                              (line 567)
+                                                              (line 566)
 * default-cert-level:                    GPG Configuration Options.
-                                                              (line 366)
+                                                              (line 371)
 * default-key:                           GPG Configuration Options.
                                                               (line  10)
 * default-key <1>:                       Input and Output.    (line  34)
 * default-keyserver-url:                 GPG Esoteric Options.
-                                                              (line 627)
+                                                              (line 626)
 * default-new-key-algo STRING:           GPG Esoteric Options.
-                                                              (line 574)
+                                                              (line 573)
 * default-preference-list:               GPG Esoteric Options.
-                                                              (line 622)
+                                                              (line 621)
 * default-recipient:                     GPG Configuration Options.
                                                               (line  19)
 * default-recipient-self:                GPG Configuration Options.
                                                               (line  23)
 * default-sig-expire:                    GPG Esoteric Options.
-                                                              (line 553)
+                                                              (line 552)
 * delete-keys:                           Operational GPG Commands.
                                                               (line 224)
 * delete-keys <1>:                       Certificate Management.
@@ -6046,14 +6171,14 @@ Option Index
 * detach-sign:                           Operational GPG Commands.
                                                               (line  28)
 * digest-algo:                           GPG Esoteric Options.
-                                                              (line 232)
+                                                              (line 231)
 * directory:                             gpgtar.              (line  76)
 * directory <1>:                         gpg-wks-client.      (line 115)
 * directory <2>:                         gpg-wks-server.      (line  50)
 * dirmngr:                               Invoking gpg-connect-agent.
                                                               (line  13)
 * dirmngr-program:                       GPG Configuration Options.
-                                                              (line 748)
+                                                              (line 753)
 * dirmngr-program <1>:                   Configuration Options.
                                                               (line  61)
 * dirmngr-program <2>:                   Invoking gpg-connect-agent.
@@ -6063,39 +6188,39 @@ Option Index
 * disable-check-own-socket:              Agent Options.       (line 325)
 * disable-check-own-socket <1>:          Dirmngr Options.     (line  79)
 * disable-cipher-algo:                   GPG Esoteric Options.
-                                                              (line 274)
+                                                              (line 273)
 * disable-crl-checks:                    Certificate Options. (line  13)
 * disable-dsa2:                          GPG Configuration Options.
-                                                              (line 190)
+                                                              (line 195)
 * disable-extended-key-format:           Agent Options.       (line 371)
 * disable-http:                          Dirmngr Options.     (line 217)
 * disable-ipv4:                          Dirmngr Options.     (line 211)
 * disable-ipv6:                          Dirmngr Options.     (line 211)
 * disable-large-rsa:                     GPG Configuration Options.
-                                                              (line 181)
+                                                              (line 186)
 * disable-ldap:                          Dirmngr Options.     (line 214)
-* disable-mdc:                           OpenPGP Options.     (line  30)
+* disable-mdc:                           OpenPGP Options.     (line  32)
 * disable-ocsp:                          Certificate Options. (line  53)
 * disable-pinpad:                        Scdaemon Options.    (line 173)
 * disable-policy-checks:                 Certificate Options. (line   8)
 * disable-pubkey-algo:                   GPG Esoteric Options.
-                                                              (line 279)
+                                                              (line 278)
 * disable-scdaemon:                      Agent Options.       (line 319)
-* disable-signer-uid:                    OpenPGP Options.     (line  37)
+* disable-signer-uid:                    OpenPGP Options.     (line  39)
 * disable-trusted-cert-crl-check:        Certificate Options. (line  24)
 * display:                               Agent Options.       (line 343)
 * display-charset:                       GPG Configuration Options.
-                                                              (line 279)
+                                                              (line 284)
 * display-charset:iso-8859-1:            GPG Configuration Options.
-                                                              (line 289)
+                                                              (line 294)
 * display-charset:iso-8859-15:           GPG Configuration Options.
-                                                              (line 295)
+                                                              (line 300)
 * display-charset:iso-8859-2:            GPG Configuration Options.
-                                                              (line 292)
+                                                              (line 297)
 * display-charset:koi8-r:                GPG Configuration Options.
-                                                              (line 298)
+                                                              (line 303)
 * display-charset:utf-8:                 GPG Configuration Options.
-                                                              (line 301)
+                                                              (line 306)
 * dry-run:                               GPG Esoteric Options.
                                                               (line   8)
 * dry-run <1>:                           gpgtar.              (line  72)
@@ -6121,23 +6246,23 @@ Option Index
 * edit-key:                              OpenPGP Key Management.
                                                               (line 139)
 * emit-version:                          GPG Esoteric Options.
-                                                              (line 129)
+                                                              (line 137)
 * enable-crl-checks:                     Certificate Options. (line  13)
 * enable-dsa2:                           GPG Configuration Options.
-                                                              (line 190)
+                                                              (line 195)
 * 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 186)
 * enable-ocsp:                           Certificate Options. (line  53)
 * 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)
+                                                              (line  94)
 * enable-putty-support:                  Agent Options.       (line 383)
 * enable-special-filenames:              GPG Esoteric Options.
-                                                              (line 609)
+                                                              (line 608)
 * enable-special-filenames <1>:          gpgv.                (line  97)
 * enable-ssh-support:                    Agent Options.       (line 383)
 * enable-trusted-cert-crl-check:         Certificate Options. (line  24)
@@ -6154,15 +6279,15 @@ Option Index
                                                               (line  35)
 * enforce-passphrase-constraints:        Agent Options.       (line 227)
 * escape-from-lines:                     GPG Esoteric Options.
-                                                              (line 304)
+                                                              (line 303)
 * exec:                                  Invoking gpg-connect-agent.
                                                               (line  28)
 * exec-path:                             GPG Configuration Options.
-                                                              (line 219)
+                                                              (line 224)
 * exit-on-status-write-error:            GPG Configuration Options.
-                                                              (line 777)
+                                                              (line 782)
 * expert:                                GPG Configuration Options.
-                                                              (line 832)
+                                                              (line 837)
 * export:                                Operational GPG Commands.
                                                               (line 250)
 * export <1>:                            Certificate Management.
@@ -6170,7 +6295,7 @@ Option Index
 * export-filter:                         GPG Input and Output.
                                                               (line 143)
 * export-options:                        GPG Input and Output.
-                                                              (line 232)
+                                                              (line 261)
 * export-ownertrust:                     Operational GPG Commands.
                                                               (line 364)
 * export-secret-key-p12:                 Certificate Management.
@@ -6191,10 +6316,10 @@ Option Index
 * factory-reset:                         gpg-card.            (line 107)
 * faked-system-time:                     Agent Options.       (line  52)
 * faked-system-time <1>:                 GPG Esoteric Options.
-                                                              (line  70)
+                                                              (line  78)
 * faked-system-time <2>:                 Esoteric Options.    (line  55)
 * fast-list-mode:                        GPG Esoteric Options.
-                                                              (line 502)
+                                                              (line 501)
 * fetch:                                 gpg-card.            (line 112)
 * fetch-crl:                             Dirmngr Commands.    (line  50)
 * fetch-keys:                            Operational GPG Commands.
@@ -6202,20 +6327,21 @@ Option Index
 * fingerprint:                           Operational GPG Commands.
                                                               (line 194)
 * fixed-list-mode:                       GPG Input and Output.
-                                                              (line 290)
+                                                              (line 334)
 * flush:                                 Dirmngr Commands.    (line  60)
 * for-your-eyes-only:                    GPG Esoteric Options.
-                                                              (line 200)
+                                                              (line 208)
 * forbid-gen-key:                        GPG Esoteric Options.
-                                                              (line 596)
+                                                              (line 595)
 * force:                                 Dirmngr Options.     (line  93)
 * 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 589)
 * forcesig:                              gpg-card.            (line 116)
 * forget:                                Invoking gpg-preset-passphrase.
                                                               (line  26)
@@ -6225,7 +6351,7 @@ Option Index
 * full-generate-key:                     OpenPGP Key Management.
                                                               (line 110)
 * full-timestrings:                      GPG Esoteric Options.
-                                                              (line  79)
+                                                              (line  87)
 * gen-key:                               OpenPGP Key Management.
                                                               (line 104)
 * gen-key <1>:                           Certificate Management.
@@ -6248,13 +6374,13 @@ Option Index
 * gnupg:                                 Compliance Options.  (line  12)
 * gpg:                                   gpgtar.              (line 135)
 * gpg-agent-info:                        GPG Configuration Options.
-                                                              (line 738)
+                                                              (line 743)
 * gpg-args:                              gpgtar.              (line 138)
 * gpg-program:                           gpg-card.            (line  69)
 * gpgconf-list:                          GPG Esoteric Options.
-                                                              (line 643)
+                                                              (line 642)
 * gpgconf-test:                          GPG Esoteric Options.
-                                                              (line 647)
+                                                              (line 646)
 * gpgsm-program:                         gpg-card.            (line  72)
 * grab:                                  Agent Options.       (line 136)
 * group:                                 GPG Key related Options.
@@ -6271,7 +6397,7 @@ Option Index
 * help <6>:                              watchgnupg.          (line  55)
 * help <7>:                              dirmngr-client.      (line  44)
 * help <8>:                              gpgtar.              (line 153)
-* help <9>:                              gpg-wks-client.      (line 134)
+* help <9>:                              gpg-wks-client.      (line 141)
 * help <10>:                             gpg-wks-server.      (line  87)
 * hex:                                   Invoking gpg-connect-agent.
                                                               (line 114)
@@ -6283,7 +6409,7 @@ Option Index
                                                               (line  29)
 * homedir:                               Agent Options.       (line  17)
 * homedir <1>:                           GPG Configuration Options.
-                                                              (line 258)
+                                                              (line 263)
 * homedir <2>:                           Configuration Options.
                                                               (line  16)
 * homedir <3>:                           Scdaemon Options.    (line  13)
@@ -6299,17 +6425,17 @@ Option Index
 * ignore-cert-extension <1>:             Certificate Options. (line  82)
 * ignore-cert-with-oid:                  Esoteric Options.    (line  46)
 * ignore-crc-error:                      GPG Esoteric Options.
-                                                              (line 415)
+                                                              (line 414)
 * ignore-http-dp:                        Dirmngr Options.     (line 220)
 * ignore-ldap-dp:                        Dirmngr Options.     (line 227)
 * ignore-mdc-error:                      GPG Esoteric Options.
-                                                              (line 422)
+                                                              (line 421)
 * ignore-ocsp-service-url:               Dirmngr Options.     (line 232)
 * ignore-time-conflict:                  GPG Esoteric Options.
-                                                              (line 401)
+                                                              (line 400)
 * ignore-time-conflict <1>:              gpgv.                (line  63)
 * ignore-valid-from:                     GPG Esoteric Options.
-                                                              (line 408)
+                                                              (line 407)
 * import:                                Operational GPG Commands.
                                                               (line 304)
 * import <1>:                            Certificate Management.
@@ -6321,7 +6447,7 @@ Option Index
 * import-ownertrust:                     Operational GPG Commands.
                                                               (line 370)
 * 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)
 * interactive:                           GPG Esoteric Options.
@@ -6338,69 +6464,69 @@ Option Index
 * keydb-clear-some-cert-flags:           Certificate Management.
                                                               (line  63)
 * keyedit:addcardkey:                    OpenPGP Key Management.
-                                                              (line 281)
+                                                              (line 283)
 * keyedit:addkey:                        OpenPGP Key Management.
-                                                              (line 278)
+                                                              (line 280)
 * keyedit:addphoto:                      OpenPGP Key Management.
                                                               (line 201)
 * keyedit:addrevoker:                    OpenPGP Key Management.
-                                                              (line 350)
+                                                              (line 352)
 * keyedit:adduid:                        OpenPGP Key Management.
                                                               (line 198)
 * keyedit:bkuptocard:                    OpenPGP Key Management.
-                                                              (line 295)
+                                                              (line 297)
 * keyedit:change-usage:                  OpenPGP Key Management.
-                                                              (line 377)
+                                                              (line 379)
 * keyedit:check:                         OpenPGP Key Management.
                                                               (line 194)
 * keyedit:clean:                         OpenPGP Key Management.
-                                                              (line 363)
+                                                              (line 365)
 * keyedit:cross-certify:                 OpenPGP Key Management.
-                                                              (line 386)
+                                                              (line 388)
 * keyedit:delkey:                        OpenPGP Key Management.
-                                                              (line 326)
+                                                              (line 328)
 * keyedit:delsig:                        OpenPGP Key Management.
                                                               (line 184)
 * keyedit:deluid:                        OpenPGP Key Management.
                                                               (line 211)
 * keyedit:disable:                       OpenPGP Key Management.
-                                                              (line 346)
+                                                              (line 348)
 * keyedit:enable:                        OpenPGP Key Management.
-                                                              (line 346)
+                                                              (line 348)
 * keyedit:expire:                        OpenPGP Key Management.
-                                                              (line 335)
+                                                              (line 337)
 * keyedit:key:                           OpenPGP Key Management.
                                                               (line 148)
 * keyedit:keyserver:                     OpenPGP Key Management.
                                                               (line 228)
 * keyedit:keytocard:                     OpenPGP Key Management.
-                                                              (line 284)
+                                                              (line 286)
 * keyedit:keytotpm:                      OpenPGP Key Management.
-                                                              (line 306)
+                                                              (line 308)
 * keyedit:lsign:                         OpenPGP Key Management.
                                                               (line 159)
 * keyedit:minimize:                      OpenPGP Key Management.
-                                                              (line 372)
+                                                              (line 374)
 * keyedit:notation:                      OpenPGP Key Management.
                                                               (line 235)
 * keyedit:nrsign:                        OpenPGP Key Management.
                                                               (line 164)
 * keyedit:passwd:                        OpenPGP Key Management.
-                                                              (line 356)
+                                                              (line 358)
 * keyedit:pref:                          OpenPGP Key Management.
                                                               (line 243)
 * keyedit:primary:                       OpenPGP Key Management.
                                                               (line 220)
 * keyedit:quit:                          OpenPGP Key Management.
-                                                              (line 397)
+                                                              (line 399)
 * keyedit:revkey:                        OpenPGP Key Management.
-                                                              (line 332)
+                                                              (line 334)
 * keyedit:revsig:                        OpenPGP Key Management.
                                                               (line 189)
 * keyedit:revuid:                        OpenPGP Key Management.
                                                               (line 217)
 * keyedit:save:                          OpenPGP Key Management.
-                                                              (line 394)
+                                                              (line 396)
 * keyedit:setpref:                       OpenPGP Key Management.
                                                               (line 255)
 * keyedit:showphoto:                     OpenPGP Key Management.
@@ -6410,28 +6536,28 @@ Option Index
 * keyedit:sign:                          OpenPGP Key Management.
                                                               (line 152)
 * keyedit:toggle:                        OpenPGP Key Management.
-                                                              (line 359)
+                                                              (line 361)
 * keyedit:trust:                         OpenPGP Key Management.
-                                                              (line 341)
+                                                              (line 343)
 * keyedit:tsign:                         OpenPGP Key Management.
                                                               (line 168)
 * keyedit:uid:                           OpenPGP Key Management.
                                                               (line 144)
 * keyid-format:                          GPG Configuration Options.
-                                                              (line 619)
+                                                              (line 624)
 * keyring:                               GPG Configuration Options.
-                                                              (line 223)
+                                                              (line 228)
 * keyring <1>:                           gpgv.                (line  38)
 * keyserver:                             Dirmngr Options.     (line 148)
 * keyserver <1>:                         GPG Configuration Options.
-                                                              (line 628)
+                                                              (line 633)
 * keyserver <2>:                         Configuration Options.
                                                               (line  43)
 * keyserver-options:                     GPG Configuration Options.
-                                                              (line 647)
+                                                              (line 652)
 * kill:                                  Invoking gpgconf.    (line  89)
 * known-notation:                        GPG Esoteric Options.
-                                                              (line 166)
+                                                              (line 174)
 * lang:                                  gpg-card.            (line 129)
 * launch:                                Invoking gpgconf.    (line  80)
 * lc-ctype:                              Agent Options.       (line 343)
@@ -6443,18 +6569,20 @@ Option Index
 * learn-card:                            Certificate Management.
                                                               (line 115)
 * legacy-list-mode:                      GPG Input and Output.
-                                                              (line 296)
+                                                              (line 340)
 * limit-card-insert-tries:               GPG Configuration Options.
-                                                              (line 786)
+                                                              (line 791)
 * list:                                  gpg-card.            (line 136)
 * list-archive:                          gpgtar.              (line  39)
 * list-chain:                            Certificate Management.
                                                               (line  32)
 * list-config:                           GPG Esoteric Options.
-                                                              (line 632)
+                                                              (line 631)
 * list-crls:                             Dirmngr Commands.    (line  38)
+* list-filter:                           GPG Configuration Options.
+                                                              (line  71)
 * list-gcrypt-config:                    GPG Esoteric Options.
-                                                              (line 640)
+                                                              (line 639)
 * list-keys:                             Operational GPG Commands.
                                                               (line 119)
 * list-keys <1>:                         Certificate Management.
@@ -6464,37 +6592,37 @@ Option Index
 * 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 124)
 * 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 139)
 * 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 128)
 * list-options:show-sig-subpackets:      GPG Configuration Options.
-                                                              (line 127)
+                                                              (line 132)
 * 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-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 143)
 * list-packets:                          Operational GPG Commands.
                                                               (line 203)
 * list-secret-keys:                      Operational GPG Commands.
@@ -6502,9 +6630,9 @@ Option Index
 * list-secret-keys <1>:                  Certificate Management.
                                                               (line  24)
 * list-signatures:                       GPG Esoteric Options.
-                                                              (line 490)
+                                                              (line 489)
 * list-sigs:                             GPG Esoteric Options.
-                                                              (line 491)
+                                                              (line 490)
 * listen-backlog:                        Agent Options.       (line 353)
 * listen-backlog <1>:                    Dirmngr Options.     (line 134)
 * listen-backlog <2>:                    Scdaemon Options.    (line 115)
@@ -6519,40 +6647,40 @@ Option Index
 * locate-keys:                           Operational GPG Commands.
                                                               (line 170)
 * lock-multiple:                         GPG Configuration Options.
-                                                              (line 766)
+                                                              (line 771)
 * lock-never:                            GPG Configuration Options.
-                                                              (line 770)
+                                                              (line 775)
 * lock-once:                             GPG Configuration Options.
-                                                              (line 762)
+                                                              (line 767)
 * log-file:                              Agent Options.       (line 142)
 * log-file <1>:                          Dirmngr Options.     (line  30)
 * log-file <2>:                          GPG Esoteric Options.
-                                                              (line 103)
+                                                              (line 111)
 * log-file <3>:                          Configuration Options.
                                                               (line  82)
 * log-file <4>:                          Scdaemon Options.    (line 120)
 * log-file <5>:                          gpgv.                (line  59)
 * logger-fd:                             GPG Esoteric Options.
-                                                              (line  99)
+                                                              (line 107)
 * logger-fd <1>:                         gpgv.                (line  56)
 * login:                                 gpg-card.            (line 153)
 * lookup:                                dirmngr-client.      (line  86)
 * lsign-key:                             OpenPGP Key Management.
-                                                              (line 412)
+                                                              (line 414)
 * mangle-dos-filenames:                  GPG Configuration Options.
-                                                              (line 350)
+                                                              (line 355)
 * marginals-needed:                      GPG Configuration Options.
-                                                              (line 707)
+                                                              (line 712)
 * max-cache-ttl:                         Agent Options.       (line 215)
 * max-cache-ttl-ssh:                     Agent Options.       (line 221)
 * max-cert-depth:                        GPG Configuration Options.
-                                                              (line 715)
+                                                              (line 720)
 * max-output:                            GPG Input and Output.
                                                               (line  19)
 * max-passphrase-days:                   Agent Options.       (line 261)
 * max-replies:                           Dirmngr Options.     (line 380)
 * min-cert-level:                        GPG Configuration Options.
-                                                              (line 395)
+                                                              (line 400)
 * min-passphrase-len:                    Agent Options.       (line 231)
 * min-passphrase-nonalpha:               Agent Options.       (line 236)
 * min-rsa-length:                        Compliance Options.  (line  65)
@@ -6571,13 +6699,13 @@ Option Index
 * no-armor:                              GPG Input and Output.
                                                               (line  12)
 * no-auto-key-import:                    GPG Configuration Options.
-                                                              (line 573)
+                                                              (line 578)
 * no-auto-key-retrieve:                  GPG Configuration Options.
-                                                              (line 585)
+                                                              (line 590)
 * no-auto-trust-new-key:                 GPG Esoteric Options.
-                                                              (line 585)
+                                                              (line 584)
 * no-autostart:                          GPG Configuration Options.
-                                                              (line 755)
+                                                              (line 760)
 * no-autostart <1>:                      Configuration Options.
                                                               (line  71)
 * no-autostart <2>:                      gpg-card.            (line  53)
@@ -6587,7 +6715,7 @@ Option Index
                                                               (line  45)
 * no-common-certs-import:                Esoteric Options.    (line 160)
 * no-default-keyring:                    GPG Esoteric Options.
-                                                              (line 468)
+                                                              (line 467)
 * no-default-recipient:                  GPG Configuration Options.
                                                               (line  29)
 * no-detach:                             Agent Options.       (line 114)
@@ -6595,35 +6723,35 @@ Option Index
 * no-encrypt-to:                         GPG Key related Options.
                                                               (line  51)
 * no-expensive-trust-checks:             GPG Esoteric Options.
-                                                              (line 614)
+                                                              (line 613)
 * no-ext-connect:                        Invoking gpg-connect-agent.
                                                               (line  73)
 * no-grab:                               Agent Options.       (line 136)
 * no-greeting:                           GPG Configuration Options.
-                                                              (line 800)
+                                                              (line 805)
 * 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 477)
 * no-literal:                            GPG Esoteric Options.
-                                                              (line 510)
+                                                              (line 509)
 * no-mangle-dos-filenames:               GPG Configuration Options.
-                                                              (line 350)
+                                                              (line 355)
 * no-options:                            GPG Configuration Options.
-                                                              (line 325)
+                                                              (line 330)
 * no-random-seed-file:                   GPG Configuration Options.
-                                                              (line 794)
+                                                              (line 799)
 * no-secmem-warning:                     GPG Configuration Options.
-                                                              (line 803)
+                                                              (line 808)
 * no-secmem-warning <1>:                 Configuration Options.
                                                               (line  78)
 * no-sig-cache:                          GPG Configuration Options.
-                                                              (line 718)
+                                                              (line 723)
 * no-skip-hidden-recipients:             GPG Key related Options.
                                                               (line 127)
 * no-symkey-cache:                       GPG Esoteric Options.
-                                                              (line 365)
+                                                              (line 364)
 * no-tty:                                GPG Configuration Options.
                                                               (line  58)
 * no-use-standard-socket:                Agent Options.       (line 333)
@@ -6632,7 +6760,7 @@ Option Index
 * no-verbose:                            GPG Configuration Options.
                                                               (line  37)
 * not-dash-escaped:                      GPG Esoteric Options.
-                                                              (line 294)
+                                                              (line 293)
 * null:                                  gpgtar.              (line  86)
 * null <1>:                              gpg-check-pattern.   (line  59)
 * ocsp:                                  dirmngr-client.      (line  61)
@@ -6648,7 +6776,7 @@ Option Index
 * options <1>:                           Dirmngr Options.     (line  11)
 * options <2>:                           Dirmngr Options.     (line  16)
 * options <3>:                           GPG Configuration Options.
-                                                              (line 320)
+                                                              (line 325)
 * options <4>:                           Configuration Options.
                                                               (line  10)
 * options <5>:                           Scdaemon Options.    (line   7)
@@ -6660,21 +6788,21 @@ Option Index
 * output <4>:                            gpg-wks-client.      (line 104)
 * output <5>:                            gpg-wks-server.      (line  65)
 * override-session-key:                  GPG Esoteric Options.
-                                                              (line 534)
+                                                              (line 533)
 * p12-charset:                           Input and Output.    (line  24)
 * passphrase:                            GPG Esoteric Options.
-                                                              (line 340)
+                                                              (line 339)
 * passphrase <1>:                        Invoking gpg-preset-passphrase.
                                                               (line  36)
 * passphrase-fd:                         GPG Esoteric Options.
-                                                              (line 319)
+                                                              (line 318)
 * passphrase-fd <1>:                     Esoteric Options.    (line 128)
 * passphrase-file:                       GPG Esoteric Options.
-                                                              (line 329)
+                                                              (line 328)
 * passphrase-repeat:                     GPG Esoteric Options.
-                                                              (line 311)
+                                                              (line 310)
 * passwd:                                OpenPGP Key Management.
-                                                              (line 473)
+                                                              (line 484)
 * passwd <1>:                            Certificate Management.
                                                               (line 121)
 * passwd <2>:                            gpg-card.            (line 163)
@@ -6682,20 +6810,20 @@ Option Index
 * 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 811)
+* personal-aead-preferences:             Deprecated Options.  (line  40)
+* 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)
+                                                              (line 201)
 * pinentry-formatted-passphrase:         Agent Options.       (line 280)
 * pinentry-invisible-char:               Agent Options.       (line 269)
 * pinentry-mode:                         GPG Esoteric Options.
-                                                              (line 350)
+                                                              (line 349)
 * pinentry-mode <1>:                     Esoteric Options.    (line 137)
 * pinentry-program:                      Agent Options.       (line 293)
 * pinentry-timeout:                      Agent Options.       (line 274)
@@ -6706,11 +6834,11 @@ Option Index
 * prefer-system-dirmngr:                 Configuration Options.
                                                               (line  65)
 * preserve-permissions:                  GPG Esoteric Options.
-                                                              (line 617)
+                                                              (line 616)
 * preset:                                Invoking gpg-preset-passphrase.
                                                               (line  22)
 * primary-keyring:                       GPG Configuration Options.
-                                                              (line 241)
+                                                              (line 246)
 * print-md:                              Operational GPG Commands.
                                                               (line 386)
 * privatedo:                             gpg-card.            (line 171)
@@ -6720,23 +6848,25 @@ Option Index
 * quick-add-key:                         OpenPGP Key Management.
                                                               (line  69)
 * quick-add-uid:                         OpenPGP Key Management.
-                                                              (line 440)
+                                                              (line 442)
 * 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 420)
 * quick-revoke-sig:                      OpenPGP Key Management.
-                                                              (line 455)
+                                                              (line 457)
 * quick-revoke-uid:                      OpenPGP Key Management.
-                                                              (line 447)
+                                                              (line 449)
 * quick-set-expire:                      OpenPGP Key Management.
                                                               (line  60)
 * quick-set-primary-uid:                 OpenPGP Key Management.
-                                                              (line 465)
+                                                              (line 467)
 * quick-sign-key:                        OpenPGP Key Management.
-                                                              (line 418)
+                                                              (line 420)
+* quick-update-pref:                     OpenPGP Key Management.
+                                                              (line 474)
 * quiet:                                 Agent Options.       (line  45)
 * quiet <1>:                             GPG Configuration Options.
                                                               (line  40)
@@ -6747,7 +6877,7 @@ Option Index
                                                               (line  40)
 * quiet <6>:                             dirmngr-client.      (line  48)
 * quiet <7>:                             gpgtar.              (line  65)
-* quiet <8>:                             gpg-wks-client.      (line 128)
+* quiet <8>:                             gpg-wks-client.      (line 135)
 * quiet <9>:                             gpg-wks-server.      (line  81)
 * quit:                                  gpg-card.            (line 177)
 * raw-socket:                            Invoking gpg-connect-agent.
@@ -6772,15 +6902,15 @@ Option Index
 * reload:                                Invoking gpgconf.    (line  74)
 * remove-socketdir:                      Invoking gpgconf.    (line 102)
 * request-origin:                        GPG Esoteric Options.
-                                                              (line 370)
+                                                              (line 369)
 * 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-cross-certification:           GPG Configuration Options.
-                                                              (line 825)
+                                                              (line 830)
 * require-secmem:                        GPG Configuration Options.
-                                                              (line 820)
+                                                              (line 825)
 * reset:                                 gpg-card.            (line 187)
 * resolver-timeout:                      Dirmngr Options.     (line 120)
 * rfc2440:                               Compliance Options.  (line  36)
@@ -6790,18 +6920,18 @@ Option Index
                                                               (line 105)
 * s:                                     Dirmngr Options.     (line  87)
 * s2k-calibration:                       Agent Options.       (line 446)
-* s2k-cipher-algo:                       OpenPGP Options.     (line  94)
+* s2k-cipher-algo:                       OpenPGP Options.     (line  87)
 * s2k-count:                             Agent Options.       (line 453)
-* s2k-count <1>:                         OpenPGP Options.     (line 110)
-* s2k-digest-algo:                       OpenPGP Options.     (line  99)
-* s2k-mode:                              OpenPGP Options.     (line 103)
+* 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 315)
 * search-keys:                           Operational GPG Commands.
                                                               (line 323)
 * secret-keyring:                        GPG Configuration Options.
-                                                              (line 246)
+                                                              (line 251)
 * send:                                  gpg-wks-client.      (line  65)
 * send <1>:                              gpg-wks-server.      (line  60)
 * send-keys:                             Operational GPG Commands.
@@ -6814,14 +6944,14 @@ Option Index
                                                               (line  24)
 * server <3>:                            Scdaemon Commands.   (line  22)
 * set-filename:                          GPG Esoteric Options.
-                                                              (line 193)
+                                                              (line 201)
 * set-filename <1>:                      gpgtar.              (line 129)
 * set-filesize:                          GPG Esoteric Options.
-                                                              (line 514)
+                                                              (line 513)
 * set-notation:                          GPG Esoteric Options.
-                                                              (line 139)
+                                                              (line 147)
 * set-policy-url:                        GPG Esoteric Options.
-                                                              (line 175)
+                                                              (line 183)
 * sh:                                    Agent Options.       (line 129)
 * sh <1>:                                Dirmngr Options.     (line  87)
 * show-certs:                            Certificate Management.
@@ -6833,37 +6963,37 @@ Option Index
 * show-photos:                           Deprecated Options.  (line   8)
 * show-policy-url:                       Deprecated Options.  (line  33)
 * show-session-key:                      GPG Esoteric Options.
-                                                              (line 518)
+                                                              (line 517)
 * shutdown:                              Dirmngr Commands.    (line  56)
 * sig-keyserver-url:                     GPG Esoteric Options.
-                                                              (line 185)
+                                                              (line 193)
 * sig-notation:                          GPG Esoteric Options.
-                                                              (line 139)
+                                                              (line 147)
 * sig-policy-url:                        GPG Esoteric Options.
-                                                              (line 175)
+                                                              (line 183)
 * sign:                                  Operational GPG Commands.
                                                               (line   8)
 * sign <1>:                              Operational GPGSM Commands.
                                                               (line  16)
 * sign-key:                              OpenPGP Key Management.
-                                                              (line 408)
+                                                              (line 410)
 * skip-crypto:                           gpgtar.              (line  68)
 * skip-hidden-recipients:                GPG Key related Options.
                                                               (line 127)
 * skip-verify:                           GPG Esoteric Options.
-                                                              (line 482)
+                                                              (line 481)
 * squid-mode:                            dirmngr-client.      (line 101)
 * ssh-fingerprint-digest:                Agent Options.       (line 431)
 * standard-resolver:                     Dirmngr Options.     (line 110)
 * status-fd:                             GPG Esoteric Options.
-                                                              (line  91)
+                                                              (line  99)
 * 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 108)
 * status-file:                           GPG Esoteric Options.
-                                                              (line  95)
+                                                              (line 103)
 * steal-socket:                          Agent Options.       (line 118)
 * store:                                 Operational GPG Commands.
                                                               (line  55)
@@ -6878,33 +7008,33 @@ Option Index
 * tar-args:                              gpgtar.              (line 141)
 * textmode:                              OpenPGP Options.     (line   8)
 * throw-keyids:                          GPG Esoteric Options.
-                                                              (line 285)
+                                                              (line 284)
 * time-only:                             watchgnupg.          (line  46)
 * tls-debug:                             Dirmngr Options.     (line  69)
 * tofu-default-policy:                   GPG Configuration Options.
-                                                              (line 711)
+                                                              (line 716)
 * tofu-policy:                           Operational GPG Commands.
                                                               (line 418)
 * trust-model:                           GPG Configuration Options.
-                                                              (line 410)
+                                                              (line 415)
 * trust-model:always:                    GPG Configuration Options.
-                                                              (line 491)
+                                                              (line 496)
 * trust-model:auto:                      GPG Configuration Options.
-                                                              (line 500)
+                                                              (line 505)
 * trust-model:classic:                   GPG Configuration Options.
-                                                              (line 418)
+                                                              (line 423)
 * trust-model:direct:                    GPG Configuration Options.
-                                                              (line 483)
+                                                              (line 488)
 * trust-model:pgp:                       GPG Configuration Options.
-                                                              (line 413)
+                                                              (line 418)
 * trust-model:tofu:                      GPG Configuration Options.
-                                                              (line 421)
+                                                              (line 426)
 * trust-model:tofu+pgp:                  GPG Configuration Options.
-                                                              (line 471)
+                                                              (line 476)
 * trustdb-name:                          GPG Configuration Options.
-                                                              (line 251)
+                                                              (line 256)
 * trusted-key:                           GPG Configuration Options.
-                                                              (line 401)
+                                                              (line 406)
 * try-all-secrets:                       GPG Key related Options.
                                                               (line 119)
 * try-secret-key:                        GPG Key related Options.
@@ -6925,14 +7055,14 @@ Option Index
 * url <1>:                               dirmngr-client.      (line  94)
 * url <2>:                               dirmngr-client.      (line  98)
 * use-agent:                             GPG Configuration Options.
-                                                              (line 735)
+                                                              (line 740)
 * use-embedded-filename:                 GPG Esoteric Options.
-                                                              (line 209)
+                                                              (line 217)
 * use-standard-socket:                   Agent Options.       (line 333)
 * use-standard-socket-p:                 Agent Options.       (line 333)
 * use-tor:                               Dirmngr Options.     (line  98)
 * utf8-strings:                          GPG Configuration Options.
-                                                              (line 306)
+                                                              (line 311)
 * utf8-strings <1>:                      gpgtar.              (line  90)
 * v:                                     Dirmngr Options.     (line  25)
 * v <1>:                                 Configuration Options.
@@ -6958,7 +7088,7 @@ Option Index
 * verbose <10>:                          dirmngr-client.      (line  53)
 * verbose <11>:                          gpgtar.              (line  61)
 * verbose <12>:                          gpg-check-pattern.   (line  53)
-* verbose <13>:                          gpg-wks-client.      (line 125)
+* verbose <13>:                          gpg-wks-client.      (line 132)
 * verbose <14>:                          gpg-wks-server.      (line  78)
 * verify:                                Operational GPG Commands.
                                                               (line  67)
@@ -6968,25 +7098,25 @@ Option Index
 * verify-files:                          Operational GPG Commands.
                                                               (line 108)
 * verify-options:                        GPG Configuration Options.
-                                                              (line 144)
+                                                              (line 149)
 * verify-options:show-keyserver-urls:    GPG Configuration Options.
-                                                              (line 163)
+                                                              (line 168)
 * verify-options:show-notations:         GPG Configuration Options.
-                                                              (line 159)
+                                                              (line 164)
 * verify-options:show-photos:            GPG Configuration Options.
-                                                              (line 149)
+                                                              (line 154)
 * verify-options:show-policy-urls:       GPG Configuration Options.
-                                                              (line 153)
+                                                              (line 158)
 * verify-options:show-primary-uid-only:  GPG Configuration Options.
-                                                              (line 175)
+                                                              (line 180)
 * verify-options:show-std-notations:     GPG Configuration Options.
-                                                              (line 159)
+                                                              (line 164)
 * verify-options:show-uid-validity:      GPG Configuration Options.
-                                                              (line 167)
+                                                              (line 172)
 * verify-options:show-unusable-uids:     GPG Configuration Options.
-                                                              (line 171)
+                                                              (line 176)
 * verify-options:show-user-notations:    GPG Configuration Options.
-                                                              (line 159)
+                                                              (line 164)
 * version:                               Agent Commands.      (line  10)
 * version <1>:                           Dirmngr Commands.    (line  10)
 * version <2>:                           General GPG Commands.
@@ -6998,42 +7128,42 @@ Option Index
 * version <6>:                           watchgnupg.          (line  52)
 * version <7>:                           dirmngr-client.      (line  40)
 * version <8>:                           gpgtar.              (line 150)
-* version <9>:                           gpg-wks-client.      (line 131)
+* version <9>:                           gpg-wks-client.      (line 138)
 * 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 446)
 * weak-digest <1>:                       gpgv.                (line  90)
 * with-colons:                           GPG Input and Output.
-                                                              (line 282)
+                                                              (line 326)
 * with-colons <1>:                       gpg-card.            (line  32)
 * 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 346)
 * with-icao-spelling:                    GPG Input and Output.
-                                                              (line 313)
+                                                              (line 357)
 * with-key-data:                         GPG Esoteric Options.
-                                                              (line 486)
+                                                              (line 485)
 * with-key-data <1>:                     Input and Output.    (line  54)
 * with-key-origin:                       GPG Input and Output.
-                                                              (line 321)
+                                                              (line 365)
 * with-keygrip:                          GPG Input and Output.
-                                                              (line 317)
+                                                              (line 361)
 * with-log:                              gpgtar.              (line 124)
 * with-secret:                           GPG Input and Output.
-                                                              (line 332)
+                                                              (line 376)
 * with-secret <1>:                       Input and Output.    (line  78)
 * with-subkey-fingerprint:               GPG Input and Output.
-                                                              (line 306)
+                                                              (line 350)
 * with-validation:                       Input and Output.    (line  60)
 * with-wkd-hash:                         GPG Input and Output.
-                                                              (line 327)
+                                                              (line 371)
 * writecert:                             gpg-card.            (line 217)
 * writekey:                              gpg-card.            (line 224)
 * xauthority:                            Agent Options.       (line 343)
diff --git a/doc/gnupg.info-3 b/doc/gnupg.info-3
index 25eaf10..a8c6372 100644
--- a/doc/gnupg.info-3
+++ b/doc/gnupg.info-3
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 97abbed..921522d 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -175,7 +175,7 @@ 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 attemps will be ignored.
+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
diff --git a/doc/gpg-card.texi b/doc/gpg-card.texi
index c215167..33cdbd9 100644
--- a/doc/gpg-card.texi
+++ b/doc/gpg-card.texi
@@ -153,7 +153,7 @@ Command completion in the interactive mode is also supported.
 @item AUTHENTICATE [--setkey] [--raw] [< @var{file}]|@var{key}]
 @itemx AUTH
 @opindex authenticate
-Authenticate to the card.  Perform a mutual autentication either by
+Authenticate to the card.  Perform a mutual authentication either by
 reading the key from @var{file} or by taking it from the command line
 as @var{key}.  Without the option @option{--raw} the key is expected
 to be hex encoded.  To install a new administration key
@@ -242,7 +242,7 @@ a @var{pinref} a menu is presented for certain cards."  In
 non-interactive mode and without a @var{pinref} a default value i used
 for these cards.  The option @option{--reset} is used with TCOS cards
 to reset the PIN using the PUK or vice versa; the option
-@var{--nullpin} is used for these cards to set the intial PIN.
+@var{--nullpin} is used for these cards to set the initial PIN.
 
 @item PRIVATEDO [--clear] @var{n} [< @var{file}]
 @opindex privatedo
diff --git a/doc/gpg.texi b/doc/gpg.texi
index 5c5bab6..804ecf9 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -616,7 +616,7 @@ 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.  The special level 16 uses a quality level of 1 and
-outpust end endless stream of hex-encoded octets.  The special level
+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}
@@ -968,7 +968,8 @@ signing.
   --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
@@ -1196,6 +1197,16 @@ user ID which shall be flagged as the primary user ID.  The primary
 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
@@ -1327,6 +1338,13 @@ Assume "yes" on most questions.  Should not be used in an option file.
 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
@@ -1736,7 +1754,8 @@ Set what trust model GnuPG should follow. The models are:
   @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
@@ -1785,7 +1804,8 @@ Set what trust model GnuPG should follow. The models are:
 
   @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 <
@@ -2030,7 +2050,7 @@ are available for all keyserver types, some common options are:
 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}
@@ -2539,11 +2559,21 @@ The available filter types are:
   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:
 
@@ -2556,10 +2586,18 @@ The available properties are:
   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
@@ -2582,7 +2620,7 @@ The available properties are:
   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.
@@ -2605,6 +2643,18 @@ The available properties are:
   @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}
@@ -2662,12 +2712,27 @@ opposite meaning.  The options are:
   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
@@ -2760,12 +2825,14 @@ is the default.
 @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
@@ -2810,16 +2877,6 @@ 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-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
@@ -2997,6 +3054,14 @@ therefore enables a fast listing of the encryption keys.
 @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
@@ -3225,16 +3290,6 @@ it allows you to violate the OpenPGP standard.  The option
 @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
@@ -3778,6 +3833,13 @@ it. These options are deprecated. Use @option{--list-options
 [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
 
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index b7d83aa..a1d1cbc 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -433,7 +433,8 @@ name may be changed on the command line (@pxref{option --options}).
 @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
diff --git a/doc/wks.texi b/doc/wks.texi
index 73934fb..a7805a3 100644
--- a/doc/wks.texi
+++ b/doc/wks.texi
@@ -213,6 +213,14 @@ 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
+@opindex 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.
+
 @item --verbose
 @opindex verbose
 Enable extra informational output.
diff --git a/g10/Makefile.am b/g10/Makefile.am
index eb23573..80b5b89 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -47,9 +47,7 @@ endif
 # 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 =
@@ -170,15 +168,15 @@ gpgv_SOURCES = gpgv.c           \
 	      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) $(resource_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) $(resource_objs)
+gpgv_LDFLAGS =
 
 
 t_common_ldadd =
@@ -187,17 +185,17 @@ 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)
 
 
diff --git a/g10/Makefile.in b/g10/Makefile.in
index 8574cff..77ae8a8 100644
--- a/g10/Makefile.in
+++ b/g10/Makefile.in
@@ -142,10 +142,9 @@ host_triplet = @host@
 @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)
+@HAVE_W32_SYSTEM_TRUE@am__append_9 = gpg-w32info.o
 subdir = g10
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
@@ -167,8 +166,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = gpg.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 @@ am_gpg_OBJECTS = gpg.$(OBJEXT) keyedit.$(OBJEXT) $(am__objects_6)
 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) $(resource_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 @@ am_gpgv_OBJECTS = gpgv.$(OBJEXT) $(am__objects_2) verify.$(OBJEXT)
 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) $(resource_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_OBJECTS = $(am_t_keydb_OBJECTS)
 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_OBJECTS = $(am_t_keydb_get_keyblock_OBJECTS)
 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_OBJECTS = $(am_t_stutter_OBJECTS)
 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
@@ -615,17 +613,7 @@ 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)
-@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 = $(am__append_9)
 
 # Convenience macros
 libcommon = ../common/libcommon.a
@@ -734,39 +722,39 @@ gpgv_SOURCES = gpgv.c           \
 	      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) $(resource_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) $(resource_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
diff --git a/g10/all-tests.scm b/g10/all-tests.scm
index 982220b..02fcde7 100644
--- a/g10/all-tests.scm
+++ b/g10/all-tests.scm
@@ -27,9 +27,10 @@
    (parse-makefile-expand filename expander key))
 
  (map (lambda (name)
-	(test::binary #f
-		      (path-join "g10" name)
-		      (path-join (getenv "objdir") "g10" name)))
+        (let ((name-ext (string-append name (getenv "EXEEXT"))))
+	  (test::binary #f
+		        (path-join "g10" name-ext)
+		        (path-join (getenv "objdir") "g10" name-ext))))
       (parse-makefile-expand (in-srcdir "g10" "Makefile.am")
 			     (lambda (filename port key) (parse-makefile port key))
 			     "module_tests")))
diff --git a/g10/armor.c b/g10/armor.c
index 7693483..b47c04a 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -247,6 +247,7 @@ is_armored (const byte *buf)
       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 @@ fake_packet( armor_filter_context_t *afx, IOBUF a,
     byte *p;
     byte tempbuf[PARTIAL_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 @@ fake_packet( armor_filter_context_t *afx, IOBUF a,
 	    continue;
 	}
 	if( !maxlen )
+          {
 	    afx->truncated++;
+            this_truncated = 1;
+          }
+        else
+          this_truncated = 0;
+
 
 	p = afx->buffer;
 	n = afx->buffer_len;
@@ -736,7 +744,7 @@ fake_packet( armor_filter_context_t *afx, IOBUF a,
 	  }
 
 	/* Now handle the end-of-line canonicalization */
-	if( !afx->not_dash_escaped )
+	if( !afx->not_dash_escaped || this_truncated)
 	  {
 	    int crlf = n > 1 && p[n-2] == '\r' && p[n-1]=='\n';
 
@@ -753,10 +761,17 @@ fake_packet( armor_filter_context_t *afx, IOBUF a,
 	     * 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->buffer[afx->buffer_len++] = '\r';
-	    afx->buffer[afx->buffer_len++] = '\n';
+	    afx->buffer[afx->buffer_len++] = this_truncated? '\f':'\n';
 	    afx->buffer[afx->buffer_len] = '\0';
 	  }
     }
@@ -1125,11 +1140,11 @@ radix64_read( armor_filter_context_t *afx, IOBUF a, size_t *retn,
 		    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 @@ armor_filter( void *opaque, int control,
 
     if( !fp ) {
 	fp = fopen("armor.out", "w");
-	assert(fp);
+	log_assert(fp);
     }
 #endif
 
@@ -1538,6 +1553,11 @@ armor_filter( void *opaque, int control,
 	    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 );
diff --git a/g10/build-packet.c b/g10/build-packet.c
index cc95355..f33d156 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -674,7 +674,8 @@ do_key (iobuf_t out, int ctb, PKT_public_key *pk)
                 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 @@ do_key (iobuf_t out, int ctb, PKT_public_key *pk)
           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 @@ do_key (iobuf_t out, int ctb, PKT_public_key *pk)
           /* 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->pkey[npkey], GCRYMPI_FLAG_OPAQUE));
+
+          p = gcry_mpi_get_opaque (pk->pkey[npkey], &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.  */
diff --git a/g10/call-agent.c b/g10/call-agent.c
index 27b5cac..66812e9 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -2997,13 +2997,15 @@ agent_import_key (ctrl_t ctrl, const char *desc, char **cache_nonce_addr,
    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)
 {
@@ -3028,6 +3030,12 @@ agent_export_key (ctrl_t ctrl, const char *hexkeygrip, const char *desc,
     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);
@@ -3038,7 +3046,7 @@ agent_export_key (ctrl_t ctrl, const char *hexkeygrip, const char *desc,
     }
 
   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);
diff --git a/g10/call-agent.h b/g10/call-agent.h
index a4cbc31..a3f234a 100644
--- a/g10/call-agent.h
+++ b/g10/call-agent.h
@@ -231,7 +231,7 @@ gpg_error_t agent_import_key (ctrl_t ctrl, const char *desc,
 /* 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);
 
diff --git a/g10/call-keyboxd.c b/g10/call-keyboxd.c
index e2fede2..7f4d5f4 100644
--- a/g10/call-keyboxd.c
+++ b/g10/call-keyboxd.c
@@ -106,7 +106,7 @@ gpg_keyboxd_deinit_session_data (ctrl_t ctrl)
               err = assuan_transact (kbl->ctx, "TRANSACTION commit",
                                      NULL, NULL, NULL, NULL, NULL, NULL);
               if (err)
-                log_error ("error commiting last transaction: %s\n",
+                log_error ("error committing last transaction: %s\n",
                             gpg_strerror (err));
               in_transaction = 0;
             }
diff --git a/g10/card-util.c b/g10/card-util.c
index 339194f..02de241 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -843,7 +843,6 @@ change_name (void)
     {
       tty_printf (_("Error: Combined name too long "
                     "(limit is %d characters).\n"), 39);
-      xfree (isoname);
       rc = gpg_error (GPG_ERR_TOO_LARGE);
       goto leave;
     }
diff --git a/g10/cipher-aead.c b/g10/cipher-aead.c
index 8eea703..640d843 100644
--- a/g10/cipher-aead.c
+++ b/g10/cipher-aead.c
@@ -295,9 +295,9 @@ do_flush (cipher_filter_context_t *cfx, iobuf_t a, byte *buf, size_t size)
           size_t n1 = cfx->chunksize - (cfx->chunklen + cfx->buflen);
           finalize = 1;
           if (DBG_FILTER)
-            log_debug ("chunksize %"PRIu64" reached;"
+            log_debug ("chunksize %llu reached;"
                        " cur buflen=%zu using %zu of %zu\n",
-                       cfx->chunksize, cfx->buflen,
+                       (unsigned long long)cfx->chunksize, cfx->buflen,
                        n1, n);
           n = n1;
         }
diff --git a/g10/decrypt-data.c b/g10/decrypt-data.c
index bdc3e22..86e208d 100644
--- a/g10/decrypt-data.c
+++ b/g10/decrypt-data.c
@@ -675,8 +675,10 @@ aead_underflow (decode_filter_ctx_t dfx, iobuf_t a, byte *buf, size_t *ret_len)
   /* 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 @@ aead_underflow (decode_filter_ctx_t dfx, iobuf_t a, byte *buf, size_t *ret_len)
       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 @@ aead_underflow (decode_filter_ctx_t dfx, iobuf_t a, byte *buf, size_t *ret_len)
       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)
diff --git a/g10/ecdh.c b/g10/ecdh.c
index c3337d1..eb14154 100644
--- a/g10/ecdh.c
+++ b/g10/ecdh.c
@@ -189,6 +189,28 @@ derive_kek (size_t kek_size,
             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 param[1];
+
+  param[0] = 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 @@ derive_kek (size_t kek_size,
   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;
diff --git a/g10/encrypt.c b/g10/encrypt.c
index 019bf0b..d0e1427 100644
--- a/g10/encrypt.c
+++ b/g10/encrypt.c
@@ -219,7 +219,7 @@ check_encryption_compliance (DEK *dek, pk_list_t pk_list)
  * 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)
 {
@@ -344,14 +344,6 @@ use_aead (pk_list_t pk_list, int algo)
 {
   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.  */
@@ -359,11 +351,11 @@ use_aead (pk_list_t pk_list, int algo)
     {
       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.  */
@@ -478,8 +470,7 @@ encrypt_simple (const char *filename, int mode, int use_seskey)
       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.  */
diff --git a/g10/exec.c b/g10/exec.c
index 75b39e0..3189fff 100644
--- a/g10/exec.c
+++ b/g10/exec.c
@@ -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,115 +29,6 @@
 #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)
diff --git a/g10/exec.h b/g10/exec.h
index 6b24d1c..b3f96cf 100644
--- a/g10/exec.h
+++ b/g10/exec.h
@@ -21,6 +21,5 @@
 #define _EXEC_H_
 
 int set_exec_path(const char *path);
-int w32_system(const char *command);
 
 #endif /* !_EXEC_H_ */
diff --git a/g10/export.c b/g10/export.c
index edf27bc..b3ad697 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -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 @@ struct export_stats_s
 };
 
 
-/* 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
   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 @@ cleanup_export_globals (void)
   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 @@ parse_export_options(char *str,unsigned int *options,int noisy)
 
       {"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 @@ parse_export_options(char *str,unsigned int *options,int noisy)
  *
  *                - 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 @@ parse_and_set_export_filter (const char *string)
     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 @@ push_export_filters (void)
   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 @@ pop_export_filters (void)
   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 @@ canon_pk_algo (enum gcry_pk_algos algo)
 }
 
 
+/* 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_params[10] = { 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_params[0],
+                                       &pub_params[1],
+                                       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_params[0],
+                                       &pub_params[1],
+                                       &pub_params[2],
+                                       &pub_params[3],
+                                       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_params[0],
+                                       &pub_params[1],
+                                       &pub_params[2],
+                                       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_params[0] = 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_params[1]);
+      if (!err && (gcry_mpi_cmp (pk->pkey[1], pub_params[1])))
+        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->pkey[idx], pub_params[idx]))
+          {
+            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->pkey[npkey] = gcry_mpi_set_opaque (NULL, buf, buflen*8);
+    for (idx=npkey+1; idx < PUBKEY_MAX_NSKEY; idx++)
+      pk->pkey[idx] = NULL;
+  }
+
+ leave:
+  gcry_sexp_release (list);
+  for (idx=0; idx < DIM(pub_params); idx++)
+    gcry_mpi_release (pub_params[idx]);
+  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 @@ print_status_exported (PKT_public_key *pk)
  * 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 @@ receive_seckey_from_agent (ctrl_t ctrl, gcry_cipher_hd_t cipherhd,
   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 @@ do_export_one_keyblock (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid,
           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 @@ do_export_one_keyblock (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid,
 }
 
 
+/* 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->keyid[0] == keyid[0] && sig->keyid[1] == keyid[1]))
+        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->revkey[i].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,13 +2374,33 @@ do_export_stream (ctrl_t ctrl, iobuf_t out, strlist_t users, int secret,
                              NULL, NULL);
           commit_kbnode (&keyblock);
         }
-      else if (export_keep_uid || export_drop_subkey)
+      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)
         {
           commit_kbnode (&keyblock);
@@ -2088,10 +2416,15 @@ do_export_stream (ctrl_t ctrl, iobuf_t out, strlist_t users, int secret,
         }
 
       /* 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;
 
@@ -2131,8 +2464,8 @@ do_export_stream (ctrl_t ctrl, iobuf_t out, strlist_t users, int secret,
   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;
 }
 
@@ -2602,74 +2935,6 @@ export_ssh_key (ctrl_t ctrl, const char *userid)
 }
 
 
-/* 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
@@ -2715,7 +2980,8 @@ export_secret_ssh_key (ctrl_t ctrl, const char *userid)
   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;
 
diff --git a/g10/gpg.c b/g10/gpg.c
index 35ffaf3..68c0454 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -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.
  *
@@ -133,6 +133,7 @@ enum cmd_and_opt_values
     aQuickRevUid,
     aQuickSetExpire,
     aQuickSetPrimaryUid,
+    aQuickUpdatePref,
     aListConfig,
     aListGcryptConfig,
     aGPGConfList,
@@ -245,7 +246,6 @@ enum cmd_and_opt_values
     oGnuPG,
     oRFC2440,
     oRFC4880,
-    oRFC4880bis,
     oOpenPGP,
     oPGP7,
     oPGP8,
@@ -254,7 +254,6 @@ enum cmd_and_opt_values
     oRFC2440Text,
     oNoRFC2440Text,
     oCipherAlgo,
-    oAEADAlgo,
     oDigestAlgo,
     oCertDigestAlgo,
     oCompressAlgo,
@@ -328,6 +327,7 @@ enum cmd_and_opt_values
     oExportOptions,
     oExportFilter,
     oListOptions,
+    oListFilter,
     oVerifyOptions,
     oTempDir,
     oExecPath,
@@ -383,7 +383,6 @@ enum cmd_and_opt_values
     oDefaultPreferenceList,
     oDefaultKeyserverURL,
     oPersonalCipherPreferences,
-    oPersonalAEADPreferences,
     oPersonalDigestPreferences,
     oPersonalCompressPreferences,
     oAgentProgram,
@@ -444,6 +443,7 @@ enum cmd_and_opt_values
     oForceSignKey,
     oForbidGenKey,
     oRequireCompliance,
+    oCompatibilityFlags,
 
     oNoop
   };
@@ -491,6 +491,7 @@ static gpgrt_opt_t opts[] = {
   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", "@"),
@@ -629,7 +630,6 @@ 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", "@"),
@@ -674,7 +674,6 @@ static gpgrt_opt_t opts[] = {
   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", "@"),
@@ -796,6 +795,7 @@ static gpgrt_opt_t opts[] = {
   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", "@"),
@@ -854,7 +854,8 @@ static gpgrt_opt_t opts[] = {
   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", "@"),
@@ -875,7 +876,6 @@ static gpgrt_opt_t opts[] = {
   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", "@"),
@@ -914,6 +914,7 @@ static gpgrt_opt_t opts[] = {
   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", "@"),
@@ -926,8 +927,6 @@ static gpgrt_opt_t opts[] = {
   /* 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
@@ -970,6 +969,9 @@ static gpgrt_opt_t opts[] = {
   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_group (302, N_(
@@ -1009,6 +1011,13 @@ static struct debug_flags_s debug_flags [] =
   };
 
 
+/* The list of compatibility flags.  */
+static struct compatibility_flags_s compatibility_flags [] =
+  {
+    { 0, NULL }
+  };
+
+
 #ifdef ENABLE_SELINUX_HACKS
 #define ALWAYS_ADD_KEYRINGS 1
 #else
@@ -1104,18 +1113,6 @@ build_list_cipher_algo_name (int algo)
 }
 
 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
@@ -1136,7 +1133,7 @@ build_list_md_algo_name (int algo)
 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 ) {
@@ -1198,13 +1195,6 @@ my_strusage( int level )
                                  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',
@@ -2084,6 +2074,10 @@ parse_list_options(char *str)
        N_("show the keyring name in key listings")},
       {"show-sig-expire",LIST_SHOW_SIG_EXPIRE,NULL,
        N_("show expiration dates during signature listings")},
+      {"show-pref", LIST_SHOW_PREF, NULL,
+       N_("show preferences")},
+      {"show-pref-verbose", LIST_SHOW_PREF_VERBOSE, NULL,
+       N_("show preferences")},
       {"show-sig-subpackets",LIST_SHOW_SIG_SUBPACKETS,NULL,
        NULL},
       {"show-only-fpr-mbox",LIST_SHOW_ONLY_FPR_MBOX, NULL,
@@ -2211,7 +2205,7 @@ static struct gnupg_compliance_option compliance_options[] =
   {
     { "gnupg",      oGnuPG },
     { "openpgp",    oOpenPGP },
-    { "rfc4880bis", oRFC4880bis },
+    { "rfc4880bis", oGnuPG },
     { "rfc4880",    oRFC4880 },
     { "rfc2440",    oRFC2440 },
     { "pgp6",       oPGP7 },
@@ -2227,29 +2221,8 @@ 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_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
@@ -2264,7 +2237,6 @@ set_compliance_option (enum cmd_and_opt_values option)
       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;
@@ -2282,7 +2254,6 @@ set_compliance_option (enum cmd_and_opt_values option)
       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;
@@ -2295,13 +2266,11 @@ 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:
       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;
@@ -2382,14 +2351,12 @@ main (int argc, char **argv)
     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;
@@ -2455,7 +2422,6 @@ main (int argc, char **argv)
     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 */
@@ -2502,7 +2468,6 @@ 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;
@@ -2716,6 +2681,7 @@ main (int argc, char **argv)
 	  case aQuickRevUid:
 	  case aQuickSetExpire:
 	  case aQuickSetPrimaryUid:
+	  case aQuickUpdatePref:
 	  case aExportOwnerTrust:
 	  case aImportOwnerTrust:
           case aRebuildKeydbCaches:
@@ -2861,6 +2827,15 @@ main (int argc, char **argv)
             allow_large_chunks = 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;
@@ -3031,7 +3006,6 @@ main (int argc, char **argv)
           case oOpenPGP:
           case oRFC2440:
           case oRFC4880:
-          case oRFC4880bis:
           case oPGP7:
           case oPGP8:
           case oGnuPG:
@@ -3269,9 +3243,6 @@ main (int argc, char **argv)
 	  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;
@@ -3388,6 +3359,11 @@ main (int argc, char **argv)
 	    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))
 	      {
@@ -3553,9 +3529,6 @@ main (int argc, char **argv)
           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;
@@ -3849,11 +3822,6 @@ 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"),
@@ -3920,6 +3888,8 @@ main (int argc, char **argv)
       }
 
     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");
@@ -3944,13 +3914,6 @@ main (int argc, char **argv)
 	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;
@@ -4011,9 +3974,6 @@ main (int argc, char **argv)
        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"));
@@ -4087,7 +4047,7 @@ main (int argc, char **argv)
     /* 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;
@@ -4098,12 +4058,6 @@ main (int argc, char **argv)
 	    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))
 	  {
@@ -4133,12 +4087,6 @@ main (int argc, char **argv)
 			 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"),
@@ -4164,7 +4112,6 @@ main (int argc, char **argv)
      * 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
@@ -4343,6 +4290,7 @@ main (int argc, char **argv)
       case aQuickAddKey:
       case aQuickRevUid:
       case aQuickSetPrimaryUid:
+      case aQuickUpdatePref:
       case aFullKeygen:
       case aKeygen:
       case aImport:
@@ -4843,6 +4791,14 @@ main (int argc, char **argv)
         }
 	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:
diff --git a/g10/gpgv.c b/g10/gpgv.c
index 3bb99dc..ceded4a 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -812,3 +812,11 @@ get_revocation_reason (PKT_signature *sig, char **r_reason,
     *r_comment = NULL;
   return 0;
 }
+
+const char *
+impex_filter_getval (void *cookie, const char *propname)
+{
+  (void)cookie;
+  (void)propname;
+  return NULL;
+}
diff --git a/g10/import.c b/g10/import.c
index bb0bf67..9fab46c 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -126,7 +126,8 @@ static int import_revoke_cert (ctrl_t ctrl, kbnode_t node, unsigned int options,
 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 @@ read_key_from_file_or_buffer (ctrl_t ctrl, const char *fname,
       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 @@ check_prefs (ctrl_t ctrl, kbnode_t keyblock)
 }
 
 
-/* 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 @@ impex_filter_getval (void *cookie, const char *propname)
   kbnode_t node = parm->node;
   static char numbuf[20];
   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 @@ impex_filter_getval (void *cookie, const char *propname)
       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 @@ impex_filter_getval (void *cookie, const char *propname)
       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 @@ impex_filter_getval (void *cookie, const char *propname)
           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);
@@ -1555,6 +1591,26 @@ impex_filter_getval (void *cookie, const char *propname)
           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 +1927,9 @@ update_key_origin (kbnode_t keyblock, u32 curtime, int origin, const char *url)
  * 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 +1937,8 @@ import_one_real (ctrl_t ctrl,
                  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 +2079,7 @@ 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)
         {
@@ -2413,10 +2471,12 @@ import_one (ctrl_t ctrl,
             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 +2492,17 @@ import_one (ctrl_t ctrl,
       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;
 }
 
@@ -3422,9 +3491,8 @@ list_standalone_revocation (ctrl_t ctrl, PKT_signature *sig, int sigrc)
 }
 
 
-/****************
- * 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 +3509,12 @@ import_revoke_cert (ctrl_t ctrl, kbnode_t node, unsigned int options,
   /* 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.  */
+
   keyid[0] = node->pkt->pkt.signature->keyid[0];
   keyid[1] = node->pkt->pkt.signature->keyid[1];
 
@@ -3788,12 +3858,15 @@ chk_self_sigs (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid, int *non_self)
 /* 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 +3956,16 @@ delete_inv_parts (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid,
               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 +3988,16 @@ delete_inv_parts (ctrl_t ctrl, kbnode_t keyblock, u32 *keyid,
 		      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
diff --git a/g10/kbnode.c b/g10/kbnode.c
index 93035e8..1f2328d 100644
--- a/g10/kbnode.c
+++ b/g10/kbnode.c
@@ -98,6 +98,19 @@ new_kbnode( PACKET *pkt )
 }
 
 
+/* Same as new_kbnode but insert the new node in front of LIST.  Returns
+ * the new list.  */
+kbnode_t
+new_kbnode2 (kbnode_t list, PACKET *pkt)
+{
+  kbnode_t n;
+
+  n = new_kbnode (pkt);
+  n->next = list;
+  return n;
+}
+
+
 KBNODE
 clone_kbnode( KBNODE node )
 {
diff --git a/g10/keydb.h b/g10/keydb.h
index a91309a..771bc8e 100644
--- a/g10/keydb.h
+++ b/g10/keydb.h
@@ -569,6 +569,7 @@ gpg_error_t hexkeygrip_from_pk (PKT_public_key *pk, char **r_grip);
 
 /*-- 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 );
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 0453801..83c20b8 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -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 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -78,7 +78,8 @@ static gpg_error_t menu_expire (ctrl_t ctrl, kbnode_t pub_keyblock,
 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,
@@ -2157,7 +2158,7 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
                    " 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;
@@ -2654,6 +2655,45 @@ keyedit_quick_set_primary (ctrl_t ctrl, const char *username,
 }
 
 
+/* 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.  */
@@ -3353,145 +3393,12 @@ tty_print_notations (int indent, PKT_signature * sig)
 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; prefs[i].type; i++)
-	{
-	  if (prefs[i].type == PREFTYPE_SYM)
-	    {
-	      if (any)
-		tty_printf (", ");
-	      any = 1;
-	      /* We don't want to display strings for experimental algos */
-	      if (!openpgp_cipher_test_algo (prefs[i].value)
-		  && prefs[i].value < 100)
-		tty_printf ("%s", openpgp_cipher_algo_name (prefs[i].value));
-	      else
-		tty_printf ("[%d]", prefs[i].value);
-	      if (prefs[i].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; prefs[i].type; i++)
-	{
-	  if (prefs[i].type == PREFTYPE_AEAD)
-	    {
-	      if (any)
-		tty_printf (", ");
-	      any = 1;
-	      /* We don't want to display strings for experimental algos */
-	      if (!openpgp_aead_test_algo (prefs[i].value)
-		  && prefs[i].value < 100)
-		tty_printf ("%s", openpgp_aead_algo_name (prefs[i].value));
-	      else
-		tty_printf ("[%d]", prefs[i].value);
-	    }
-	}
-      tty_printf ("\n     ");
-      tty_printf (_("Digest: "));
-      for (i = any = 0; prefs[i].type; i++)
-	{
-	  if (prefs[i].type == PREFTYPE_HASH)
-	    {
-	      if (any)
-		tty_printf (", ");
-	      any = 1;
-	      /* We don't want to display strings for experimental algos */
-	      if (!gcry_md_test_algo (prefs[i].value) && prefs[i].value < 100)
-		tty_printf ("%s", gcry_md_algo_name (prefs[i].value));
-	      else
-		tty_printf ("[%d]", prefs[i].value);
-	      if (prefs[i].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; prefs[i].type; i++)
-	{
-	  if (prefs[i].type == PREFTYPE_ZIP)
-	    {
-	      const char *s = compress_algo_to_string (prefs[i].value);
-
-	      if (any)
-		tty_printf (", ");
-	      any = 1;
-	      /* We don't want to display strings for experimental algos */
-	      if (s && prefs[i].value < 100)
-		tty_printf ("%s", s);
-	      else
-		tty_printf ("[%d]", prefs[i].value);
-	      if (prefs[i].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)
 	{
@@ -3518,22 +3425,7 @@ show_prefs (PKT_user_id * uid, PKT_signature * selfsig, int verbose)
     }
   else
     {
-      tty_printf ("    ");
-      for (i = 0; prefs[i].type; i++)
-	{
-	  tty_printf (" %c%d", prefs[i].type == PREFTYPE_SYM ? 'S' :
-		      prefs[i].type == PREFTYPE_AEAD ? 'A' :
-		      prefs[i].type == PREFTYPE_HASH ? 'H' :
-		      prefs[i].type == PREFTYPE_ZIP ? 'Z' : '?',
-		      prefs[i].value);
-	}
-      if (uid->flags.mdc)
-	tty_printf (" [mdc]");
-      if (uid->flags.aead)
-	tty_printf (" [aead]");
-      if (!uid->flags.ks_modify)
-	tty_printf (" [no-ks-modify]");
-      tty_printf ("\n");
+      show_preferences (uid, 4, -1, 0);
     }
 }
 
@@ -5260,10 +5152,11 @@ menu_set_primary_uid (ctrl_t ctrl, kbnode_t pub_keyblock)
 
 
 /*
- * 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;
@@ -5272,9 +5165,10 @@ menu_set_preferences (ctrl_t ctrl, kbnode_t pub_keyblock)
   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;
diff --git a/g10/keyedit.h b/g10/keyedit.h
index b6e5b58..ea4fd25 100644
--- a/g10/keyedit.h
+++ b/g10/keyedit.h
@@ -55,6 +55,7 @@ void keyedit_quick_set_expire (ctrl_t ctrl,
                                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,
diff --git a/g10/keygen.c b/g10/keygen.c
index 7a79b37..4dcf7a4 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -407,7 +407,7 @@ keygen_set_std_prefs (const char *string,int personal)
 	      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)
@@ -564,29 +564,6 @@ keygen_set_std_prefs (const char *string,int personal)
 		    opt.personal_cipher_prefs[i].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_prefs[i].type = PREFTYPE_AEAD;
-			opt.personal_aead_prefs[i].value = aead[i];
-		      }
-
-		    opt.personal_aead_prefs[i].type = PREFTYPE_NONE;
-		    opt.personal_aead_prefs[i].value = 0;
-		  }
-	      }
 	    else if(personal==PREFTYPE_HASH)
 	      {
 		xfree(opt.personal_digest_prefs);
@@ -915,7 +892,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, opt.flags.rfc4880bis);
+  add_feature_v5 (sig, 1);
   add_keyserver_modify (sig,ks_modify);
   keygen_add_keyserver_url(sig,NULL);
 
@@ -3410,10 +3387,7 @@ parse_key_parameter_part (ctrl_t ctrl,
                 }
             }
           else if (!ascii_strcasecmp (s, "v5"))
-            {
-              if (opt.flags.rfc4880bis)
-                keyversion = 5;
-            }
+            keyversion = 5;
           else if (!ascii_strcasecmp (s, "v4"))
             keyversion = 4;
           else
@@ -3672,7 +3646,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 (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
@@ -4454,9 +4428,9 @@ read_parameter_file (ctrl_t ctrl, const char *fname )
 	    }
 	}
 
-        if (!opt.flags.rfc4880bis && (keywords[i].key == pVERSION
-                                      || keywords[i].key == pSUBVERSION))
-          ; /* Ignore version unless --rfc4880bis is active.  */
+        if ((keywords[i].key == pVERSION
+             || keywords[i].key == pSUBVERSION))
+          ; /* Ignore version.  */
         else
           {
             r = xmalloc_clear( sizeof *r + strlen( value ) );
@@ -4551,14 +4525,11 @@ quickgen_set_para (struct para_data_s *para, int for_subkey,
       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)
     {
@@ -5315,8 +5286,8 @@ card_store_key_with_backup (ctrl_t ctrl, PKT_public_key *sub_psk,
       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",
diff --git a/g10/keylist.c b/g10/keylist.c
index e785aa0..1ced732 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -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 @@ struct keylist_context
   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;
 
 
+
+
+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 @@ keylist_context_release (struct keylist_context *listctx)
 }
 
 
+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 @@ print_card_key_info (estream_t fp, kbnode_t keyblock)
 #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; prefs[i].type; i++)
+	{
+	  if (prefs[i].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 (prefs[i].value)
+		  && prefs[i].value < 100)
+		tty_fprintf (fp, "%s", openpgp_cipher_algo_name (prefs[i].value));
+	      else
+		tty_fprintf (fp, "[%d]", prefs[i].value);
+	      if (prefs[i].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; prefs[i].type; i++)
+	{
+	  if (prefs[i].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 (prefs[i].value)
+		  && prefs[i].value < 100)
+		tty_fprintf (fp, "%s", openpgp_aead_algo_name (prefs[i].value));
+	      else
+		tty_fprintf (fp, "[%d]", prefs[i].value);
+	    }
+	}
+      tty_fprintf (fp, "\n%*s %s", indent, "", _("Digest: "));
+      for (i = any = 0; prefs[i].type; i++)
+	{
+	  if (prefs[i].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 (prefs[i].value) && prefs[i].value < 100)
+		tty_fprintf (fp, "%s", gcry_md_algo_name (prefs[i].value));
+	      else
+		tty_fprintf (fp, "[%d]", prefs[i].value);
+	      if (prefs[i].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; prefs[i].type; i++)
+	{
+	  if (prefs[i].type == PREFTYPE_ZIP)
+	    {
+	      const char *s = compress_algo_to_string (prefs[i].value);
+
+	      if (any)
+		tty_fprintf (fp, ", ");
+	      any = 1;
+	      /* We don't want to display strings for experimental algos */
+	      if (s && prefs[i].value < 100)
+		tty_fprintf (fp, "%s", s);
+	      else
+		tty_fprintf (fp, "[%d]", prefs[i].value);
+	      if (prefs[i].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; prefs[i].type; i++)
+        {
+          tty_fprintf (fp, " %c%d", prefs[i].type == PREFTYPE_SYM ? 'S' :
+                       prefs[i].type == PREFTYPE_AEAD ? 'A' :
+                       prefs[i].type == PREFTYPE_HASH ? 'H' :
+                       prefs[i].type == PREFTYPE_ZIP ? 'Z' : '?',
+                       prefs[i].value);
+        }
+      if (uid->flags.mdc)
+        tty_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,
@@ -1269,6 +1491,11 @@ list_keyblock_print (ctrl_t ctrl, kbnode_t keyblock, int secret, int fpr,
 	  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;
@@ -1991,6 +2218,7 @@ reorder_keyblock (KBNODE keyblock)
   do_reorder_keyblock (keyblock, 0);
 }
 
+
 static void
 list_keyblock (ctrl_t ctrl,
                KBNODE keyblock, int secret, int has_secret, int fpr,
@@ -1998,6 +2226,24 @@ list_keyblock (ctrl_t ctrl,
 {
   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))
diff --git a/g10/main.h b/g10/main.h
index 74c29cc..62d2651 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -41,8 +41,6 @@
 # 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
 #ifdef HAVE_ZIP
@@ -169,7 +167,6 @@ const char *compress_algo_to_string(int algo);
 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);
 
@@ -240,8 +237,6 @@ void display_online_help( const char *keyword );
 
 /*-- encode.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 );
@@ -436,10 +431,10 @@ gpg_error_t export_pubkey_buffer (ctrl_t ctrl, const char *keyspec,
                                   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 +464,7 @@ void release_revocation_reason_info (struct revocation_reason_info *reason);
 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 +473,7 @@ int  cmp_signodes (const void *av, const void *bv);
 void print_fingerprint (ctrl_t ctrl, estream_t fp,
                         PKT_public_key *pk, int mode);
 void print_revokers (estream_t fp, PKT_public_key *pk);
+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);
diff --git a/g10/mainproc.c b/g10/mainproc.c
index f8f3c15..330ad10 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -726,7 +726,7 @@ proc_encrypted (CTX c, PACKET *pkt)
     }
 
   /* Compute compliance with CO_DE_VS.  */
-  if (!result && is_status_enabled ()
+  if (!result && (is_status_enabled () || opt.flags.require_compliance)
       /* Overriding session key voids compliance.  */
       && !opt.override_session_key
       /* Check symmetric cipher.  */
diff --git a/g10/misc.c b/g10/misc.c
index 5816012..dcf0018 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -1387,17 +1387,6 @@ default_cipher_algo(void)
 }
 
 
-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_prefs[0].value;
-  else
-    return DEFAULT_AEAD_ALGO;
-}
-
 /* There is no default_digest_algo function, but see
    sign.c:hash_for() */
 
diff --git a/g10/options.h b/g10/options.h
index 10e61ea..c108626 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -92,7 +92,6 @@ struct
   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;
@@ -180,7 +179,6 @@ struct
   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;
@@ -308,6 +306,9 @@ struct
   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 +364,11 @@ struct {
 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 +406,8 @@ EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode;
 #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 +424,8 @@ EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode;
 #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 VERIFY_SHOW_PHOTOS               (1<<0)
 #define VERIFY_SHOW_POLICY_URLS          (1<<1)
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index b6aebbb..a033732 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -2752,11 +2752,15 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
 		  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)
@@ -2768,7 +2772,7 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
 		}
 
               /* Print some info.  */
-	      if (list_mode)
+	      if (list_mode && ski->s2k.mode != 1003)
 		{
 		  es_fprintf (listfp, ", algo: %d,%s hash: %d",
                               ski->algo,
@@ -2779,8 +2783,9 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
 		      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)
@@ -2838,7 +2843,7 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
 	  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;
@@ -2850,7 +2855,7 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
 	    }
 	  for (i = 0; i < ski->ivlen; i++, pktlen--)
 	    temp[i] = iobuf_get_noeof (inp);
-	  if (list_mode)
+	  if (list_mode && ski->s2k.mode != 1003)
 	    {
 	      es_fprintf (listfp,
                           ski->s2k.mode == 1002 ? "\tserial-number: "
@@ -2888,6 +2893,35 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
 						 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->pkey[npkey] = gcry_mpi_set_opaque (NULL,
+						 tmpp, tmpp? pktlen * 8 : 0);
+          pktlen = 0;
+	}
       else if (ski->is_protected)
 	{
           void *tmpp;
diff --git a/g10/photoid.c b/g10/photoid.c
index 2c95930..72e6acf 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -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 *
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 9b08cc4..459e759 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -1603,8 +1603,6 @@ select_algo_from_prefs(PK_LIST pk_list, int preftype,
       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)
@@ -1720,7 +1718,7 @@ select_aead_from_pklist (PK_LIST pk_list)
         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. */
 }
 
 
diff --git a/g10/test-stubs.c b/g10/test-stubs.c
index cfe33b1..6ae0f4e 100644
--- a/g10/test-stubs.c
+++ b/g10/test-stubs.c
@@ -572,3 +572,11 @@ get_revocation_reason (PKT_signature *sig, char **r_reason,
     *r_comment = NULL;
   return 0;
 }
+
+const char *
+impex_filter_getval (void *cookie, const char *propname)
+{
+  (void)cookie;
+  (void)propname;
+  return NULL;
+}
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 7e24864..051a534 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -1707,38 +1707,50 @@ sanitize_regexp(const char *old)
   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
diff --git a/g13/Makefile.in b/g13/Makefile.in
index a35d45b..be1bd7d 100644
--- a/g13/Makefile.in
+++ b/g13/Makefile.in
@@ -484,16 +484,6 @@ 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)
-@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
diff --git a/g13/all-tests.scm b/g13/all-tests.scm
index c96f092..8133723 100644
--- a/g13/all-tests.scm
+++ b/g13/all-tests.scm
@@ -34,9 +34,10 @@
 			        "g13"))))
  (if g13-enabled?
      (map (lambda (name)
-	    (test::binary #f
-		          (path-join "g13" name)
-		          (path-join (getenv "objdir") "g13" 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"))
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index f5fe341..66214fa 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -37,12 +37,6 @@ else
 libexec_PROGRAMS =
 endif
 
-if HAVE_W32CE_SYSTEM
-extra_libs =  $(LIBASSUAN_LIBS)
-else
-extra_libs =
-endif
-
 common_libs = $(libcommon)
 commonpth_libs = $(libcommonpth)
 
@@ -75,7 +69,7 @@ libkeybox509_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS) -DKEYBOX
 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 +92,7 @@ keyboxd_LDADD = $(commonpth_libs) \
 	        $(SQLITE3_LIBS) $(GPG_ERROR_LIBS) \
                 $(LIBINTL) $(NETLIBS) $(LIBICONV) \
 		$(resource_objs)
-keyboxd_LDFLAGS = $(extra_bin_ldflags)
+keyboxd_LDFLAGS =
 keyboxd_DEPENDENCIES = $(resource_objs)
 
 
diff --git a/kbx/Makefile.in b/kbx/Makefile.in
index 4d732bf..64bf256 100644
--- a/kbx/Makefile.in
+++ b/kbx/Makefile.in
@@ -209,12 +209,10 @@ am__objects_5 = kbxutil-keybox-util.$(OBJEXT) \
 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) \
@@ -535,16 +533,6 @@ 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)
-@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 +542,6 @@ libcommontls = ../common/libcommontls.a
 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 +570,7 @@ libkeybox509_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS) -DKEYBOX
 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 +594,7 @@ keyboxd_LDADD = $(commonpth_libs) \
                 $(LIBINTL) $(NETLIBS) $(LIBICONV) \
 		$(resource_objs)
 
-keyboxd_LDFLAGS = $(extra_bin_ldflags)
+keyboxd_LDFLAGS = 
 keyboxd_DEPENDENCIES = $(resource_objs)
 all: all-am
 
diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4
index 4b5cd40..a975e53 100644
--- a/m4/gpg-error.m4
+++ b/m4/gpg-error.m4
@@ -10,7 +10,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# Last-changed: 2022-02-15
+# Last-changed: 2022-09-21
 
 
 dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION,
@@ -120,6 +120,10 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
         fi
         if test -n "$gpgrt_libdir"; then break; fi
       done
+      if test -z "$libdir_candidates"; then
+        # No valid pkgconfig dir in any of the system directories, fallback
+        gpgrt_libdir=${possible_libdir1}
+      fi
     else
       # When we cannot determine system libdir-format, use this:
       gpgrt_libdir=${possible_libdir1}
diff --git a/m4/ksba.m4 b/m4/ksba.m4
index 6b55bb8..452c245 100644
--- a/m4/ksba.m4
+++ b/m4/ksba.m4
@@ -9,7 +9,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# Last-changed: 2020-11-18
+# Last-changed: 2022-11-01
 
 dnl AM_PATH_KSBA([MINIMUM-VERSION,
 dnl              [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
@@ -44,7 +44,7 @@ AC_DEFUN([AM_PATH_KSBA],
   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"
       AC_MSG_NOTICE([Use gpgrt-config as ksba-config])
diff --git a/m4/libassuan.m4 b/m4/libassuan.m4
index df50484..79391bb 100644
--- a/m4/libassuan.m4
+++ b/m4/libassuan.m4
@@ -9,7 +9,7 @@ dnl This file is distributed in the hope that it will be useful, but
 dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 dnl SPDX-License-Identifier: FSFULLR
-# Last-changed: 2020-11-17
+# Last-changed: 2022-11-01
 
 dnl
 dnl Common code used for libassuan detection [internal]
@@ -28,7 +28,7 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
   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"
       AC_MSG_NOTICE([Use gpgrt-config as libassuan-config])
diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
index 19d514f..cd4249e 100644
--- a/m4/libgcrypt.m4
+++ b/m4/libgcrypt.m4
@@ -9,7 +9,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# Last-changed: 2020-09-27
+# Last-changed: 2022-11-01
 
 
 dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
@@ -40,7 +40,7 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
   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"
       AC_MSG_NOTICE([Use gpgrt-config as libgcrypt-config])
diff --git a/m4/npth.m4 b/m4/npth.m4
index 06cdaee..619ed89 100644
--- a/m4/npth.m4
+++ b/m4/npth.m4
@@ -9,7 +9,7 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# Last-changed: 2020-11-17
+# Last-changed: 2022-11-01
 
 AC_DEFUN([_AM_PATH_NPTH_CONFIG],
 [ AC_ARG_WITH(npth-prefix,
@@ -21,7 +21,7 @@ AC_DEFUN([_AM_PATH_NPTH_CONFIG],
   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"
       AC_MSG_NOTICE([Use gpgrt-config as npth-config])
diff --git a/m4/ntbtls.m4 b/m4/ntbtls.m4
index 55de483..fff4256 100644
--- a/m4/ntbtls.m4
+++ b/m4/ntbtls.m4
@@ -9,7 +9,7 @@ dnl This file is distributed in the hope that it will be useful, but
 dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 dnl
-dnl Last-changed: 2020-11-18
+dnl Last-changed: 2022-11-01
 
 
 dnl AM_PATH_NTBTLS([MINIMUM-VERSION,
@@ -36,7 +36,7 @@ AC_DEFUN([AM_PATH_NTBTLS],
   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"
       AC_MSG_NOTICE([Use gpgrt-config as ntbtls-config])
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2658660..75154ea 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -15,7 +15,6 @@ agent/cvt-openpgp.c
 
 common/exechelp-posix.c
 common/exechelp-w32.c
-common/exechelp-w32ce.c
 common/simple-pwquery.c
 common/sysutils.c
 common/yesno.c
diff --git a/po/ca.gmo b/po/ca.gmo
index d2b9e1a..6bf8886 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
diff --git a/po/ca.po b/po/ca.po
index 88eee5d..7be07b4 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -162,8 +162,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "la contrasenya és errònia"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
@@ -217,25 +217,25 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, 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:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, 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:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -246,26 +246,26 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -278,39 +278,39 @@ msgstr ""
 "no s'ha trobat cap anell secret de escrivible: %s\n"
 "\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, 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:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, 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:3797
+#: agent/command-ssh.c:3837
 #, 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"
@@ -442,215 +442,224 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "detall"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualitza la base de dades de confiança"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 #, 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:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 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:222
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "no és suportat"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 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:227
+#: agent/gpg-agent.c:228
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "no és suportat"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+# Gènere?  Nombre?  ivb
+# Werner FIXME: please add translator comment saying *what* is
+# uncompressed so we know the gender. jm
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "no és suportat"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|usa el mode de contrasenya especificat"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "utilitza el gpg-agent"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
@@ -658,149 +667,149 @@ msgstr ""
 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:570
+#: agent/gpg-agent.c:582
 #, 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:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, 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:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AV�S: %s és una opció desaconsellada.\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, fuzzy, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, 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:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, 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:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, 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:2406
+#: agent/gpg-agent.c:2427
 #, 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:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, 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:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2853
+#: agent/gpg-agent.c:2967
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, 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:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claus es descarta\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1064,7 +1073,7 @@ msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 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:1602
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1082,52 +1091,52 @@ msgstr "l'algoritme de protecció %d%s no està suportat\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1160,18 +1169,18 @@ msgstr "AV�S: el propietari és insegur en %s «%s»\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AV�S: els permissos són insegurs en %s «%s»\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "sí|si"
 
@@ -1227,8 +1236,8 @@ msgstr ""
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1248,79 +1257,79 @@ msgstr "AV�S: %s és una opció desaconsellada.\n"
 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:432 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"
@@ -1502,12 +1511,12 @@ msgstr ""
 "No s'han trobat certificats amb confiança no definida.\n"
 "\n"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificat correcte"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "La clau és disponible en: "
@@ -1549,7 +1558,7 @@ msgstr "No hi ha ajuda disponible per a `%s'"
 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]"
@@ -1594,36 +1603,36 @@ msgstr "no es pot obrir el fitxer: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: 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
 #, 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"
@@ -1633,95 +1642,95 @@ msgstr "s'està escrivint la clau secreta a «%s»\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: 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"
@@ -1729,13 +1738,13 @@ msgstr ""
 "hi ha un caràcter «quoted printable» en l'armadura - probablement s'ha "
 "utilitzat un MTA amb errors\n"
 
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "no llegible per humans"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1744,27 +1753,27 @@ msgstr ""
 "un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
 "amb el signe «=»\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, 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:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1774,7 +1783,7 @@ msgstr ""
 "un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
 "amb el signe «=»\n"
 
-#: g10/build-packet.c:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "AV�S: s'hi han trobat dades de notació invàlides\n"
@@ -1788,7 +1797,7 @@ msgstr "no s'ha pogut posar «%s» en la base de dades de confiança - %s\n"
 msgid "Enter passphrase: "
 msgstr "Introduïu la contrasenya: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 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"
@@ -1806,7 +1815,7 @@ msgstr "error en la lectura de «%s»: %s\n"
 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:2330
+#: 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"
@@ -1849,60 +1858,60 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
@@ -1910,122 +1919,122 @@ msgstr ""
 # 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:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "forçat"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1500
+#: g10/card-util.c:803 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1502
+#: g10/card-util.c:805 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferències actualitzades"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 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:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Empremta digital:"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -2033,102 +2042,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 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:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2136,196 +2145,196 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 #, 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:1743 g10/card-util.c:1833
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1744 g10/card-util.c:1835
 #, 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:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 #, 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:1876
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "ix del menú"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 #, 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:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 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:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3689
+#: g10/card-util.c:2262 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3690
+#: g10/card-util.c:2263 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:3691
+#: g10/card-util.c:2264 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:3692
+#: g10/card-util.c:2265 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra empremta"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3696
+#: g10/card-util.c:2269 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:3697
+#: g10/card-util.c:2270 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3698
+#: g10/card-util.c:2271 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 #, 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:2276
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2389,9 +2398,9 @@ msgstr "clau"
 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:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
@@ -2423,18 +2432,18 @@ msgid ""
 msgstr ""
 "forçar el xifrat asimètric %s (%d) viola les preferències del destinatari\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, 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"
@@ -2444,46 +2453,47 @@ msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
 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:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 msgid "using cipher %s.%s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, 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:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, 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:862
+#: g10/encrypt.c:853
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "s'està llegint des de «%s»\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2492,13 +2502,13 @@ msgstr ""
 "forçar l'algoritme de compressió %s (%d) viola les preferències del "
 "destinatari\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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"
@@ -2530,71 +2540,82 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "AV�S: no s'ha exportat res\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2664,7 +2685,7 @@ msgstr ""
 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:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opcions d'importació no vàlides\n"
@@ -2750,120 +2771,120 @@ msgstr "genera un nou parell de claus"
 msgid "quickly set a new expiration date"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
@@ -2879,57 +2900,57 @@ msgstr "no fa cap canvi"
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 #, 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:781
+#: g10/gpg.c:780
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "comprova les signatures de la claus"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2957,7 +2978,7 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2968,7 +2989,7 @@ msgstr ""
 # Crec q (A)lice (orig.), (B)ob (dest.), etc. són noms usats pel Zimmerman
 # en el manual original de PGP.  A, B, C...  ivb
 # En efecte. Idem per a Mallory més endavant. Els deixe com a l'original. jm
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2998,13 +3019,13 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 #, 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:1175
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -3024,7 +3045,7 @@ msgstr ""
 # Precissament acabem de parlar d'«implementat a la llista del GNOME
 # i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
 # encara no m'agraden massa... jm
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -3032,577 +3053,566 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, 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:1708
+#: g10/gpg.c:1698
 #, 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:1711
+#: g10/gpg.c:1701
 #, 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:1714
+#: g10/gpg.c:1704
 #, 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:1720
+#: g10/gpg.c:1710
 #, 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:1723
+#: g10/gpg.c:1713
 #, 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:1726
+#: g10/gpg.c:1716
 #, 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:1732
+#: g10/gpg.c:1722
 #, 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:1735
+#: g10/gpg.c:1725
 #, 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:1738
+#: g10/gpg.c:1728
 #, 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:1744
+#: g10/gpg.c:1734
 #, 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:1747
+#: g10/gpg.c:1737
 #, 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:1750
+#: g10/gpg.c:1740
 #, 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:1966
+#: g10/gpg.c:1956
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 #, 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:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "estableix la llista de preferències"
+
+#: g10/gpg.c:2197
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, 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:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, 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:3220
+#: g10/gpg.c:3194
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, 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:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, 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:3355
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 #, 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:3420
+#: g10/gpg.c:3396
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 #, 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:3431
+#: g10/gpg.c:3407
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, 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:3648
+#: g10/gpg.c:3621
 #, 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:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, 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:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AV�S: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, 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:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3952
-#, 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:3964
+#: g10/gpg.c:3927
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, 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:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:4015
-#, 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:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, 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:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, 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:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 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:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, 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:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, 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:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, 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:5726
+#: g10/gpg.c:5682
 #, 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:5759
+#: g10/gpg.c:5715
 #, 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"
@@ -3616,7 +3626,7 @@ msgstr "pren les claus d'aquest anell"
 msgid "make timestamp conflicts only a warning"
 msgstr "fes els conflictes de marques de temps només un avís"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 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"
 
@@ -3648,20 +3658,20 @@ msgstr "No hi ha ajuda disponible"
 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"
@@ -3669,317 +3679,317 @@ msgstr "actualitza la base de dades de confiança"
 # 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:1998 g10/import.c:3146
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, 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:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, 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:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, 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:2793
 #, 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:2801
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
@@ -3992,69 +4002,69 @@ msgstr "error mentre s'enviava a «%s»: %s\n"
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, 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:3138 g10/import.c:3177
 #, 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:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "raó de la revocació: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "comentari de la revocació: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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"
@@ -4062,22 +4072,22 @@ msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
 # O «rebutjara»? ivb
 # Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
 # «es rebutja» està bé. jm
-#: g10/import.c:3512
+#: g10/import.c:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
@@ -4085,121 +4095,121 @@ msgstr ""
 "«%s»\n"
 "\n"
 
-#: g10/import.c:3652
+#: g10/import.c:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, 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:3788
 #, 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:3812
 #, 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:3825
 #, 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:3840
 #, 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:3887
 #, 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:3914
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clau %08lX: es descarta la subclau\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
@@ -4237,7 +4247,7 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "L'ID d'usuari «%s» està revocat."
 msgstr[1] "L'ID d'usuari «%s» està revocat."
 
-#: g10/key-check.c:726 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"
@@ -4245,7 +4255,7 @@ msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr[0] "1 signatura no comprovada per falta de clau\n"
 msgstr[1] "1 signatura no comprovada per falta de clau\n"
 
-#: g10/key-check.c:734 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"
@@ -4299,15 +4309,15 @@ msgstr "error en crear «%s»: %s\n"
 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:262
 msgid "[revocation]"
 msgstr "[revocació]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[autosignatura]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4319,70 +4329,70 @@ msgstr ""
 "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:389 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:390 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:408
 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:425
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  No es pot signar.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'ID d'usuari «%s» ha caducat."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, 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:646
 #, 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:648
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4391,11 +4401,11 @@ msgstr ""
 "La vostra signatura en «%s»\n"
 "és una signatura d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4404,11 +4414,11 @@ msgstr ""
 "La vostra signatura actual en «%s»\n"
 "ha caducat.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4417,43 +4427,43 @@ msgstr ""
 "La vostra signatura en «%s»\n"
 "és una signatura local.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "La clau ha caducat!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4463,32 +4473,32 @@ msgstr ""
 "pertany realment a la persona esmentada anteriorment? Si no sabeu què \n"
 "contestar, entreu «0».\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, 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:876
 #, 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:878
 #, 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:881
 #, 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:888
 #, 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:915
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4497,138 +4507,138 @@ msgstr ""
 "Esteu segur que voleu signar aquesta clau\n"
 "amb la vostra clau: \""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Açò serà una autosignatura.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, 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:935
 #, 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:945
 #, 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:952
 #, 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:959
 #, 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:964
 #, 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:969
 #, 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:981
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "desa i ix"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra empremta"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Notació de signatura: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 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:1273
 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:1274
 #, fuzzy
 msgid "select subkey N"
 msgstr "tria l'ID d'usuari N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca signatures"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signa la clau localment"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, 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:1289
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "add a user ID"
 msgstr "afegeix un ID d'usuari"
 
@@ -4636,149 +4646,149 @@ msgstr "afegeix un ID d'usuari"
 # 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:1293
 msgid "add a photo ID"
 msgstr "afegeix un photo ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "esborra un ID d'usuari"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "esborra una clau secundària"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "afegeix una clau de revocació"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 #, 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:1314
 #, 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:1316
 #, 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:1319
 msgid "list preferences (expert)"
 msgstr "llista les preferències (expert)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "llista les preferències (detallat)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 #, 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:1325
 #, 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:1327
 #, 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:1329
 msgid "change the passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "canvia la confiança"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 #, 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:1337
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un ID d'usuari"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una clau secundària"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 #, fuzzy
 msgid "enable key"
 msgstr "activa una clau"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva una clau"
 
 # Igual que dalt.  ivb
 # Idem :) jm
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra el photo ID"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1349
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1470
 msgid "Secret key is available.\n"
 msgstr "La clau secreta està disponible.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 #, 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:1574
 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:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4786,314 +4796,298 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "La clau està revocada."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 #, 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:1682
 #, 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:1690
 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:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 #, 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:1756
 #, 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:1814 g10/keyedit.c:1854
 #, 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 #, 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:1894
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, 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:1934
 #, 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:1969
 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:1975
 #, 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:1977
 #, 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:2015
 #, 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:2016
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2034
 #, 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:2045
 #, 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:2047
 #, 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:2105
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2150
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estableix la llista de preferències"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 #, 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:2159
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realment voleu actualitzar les preferències? "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Voleu desar els canvis? "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, 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:2557
+#: g10/keyedit.c:2558
 #, 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:2583
+#: g10/keyedit.c:2584
 #, 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:2646
+#: g10/keyedit.c:2647
 #, 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:2677
+#: g10/keyedit.c:2717
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, 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:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, 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:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Usuari inexistent.\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "No hi ha res que signar amb la clau %08lX\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, 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:3211
+#: g10/keyedit.c:3251
 #, 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:3253
+#: g10/keyedit.c:3293
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Resum: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Funcionalitats: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 #, fuzzy
 msgid "Notations: "
 msgstr "Notació: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 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:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5101,19 +5095,19 @@ msgstr ""
 "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:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5123,19 +5117,19 @@ msgstr ""
 "      causar que una ID d'usuari diferent esdevinga en la primària "
 "assumida.\n"
 
-#: g10/keyedit.c:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5144,38 +5138,38 @@ msgstr ""
 "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:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 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:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 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:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5183,37 +5177,37 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "S'ha esborrat %d signatura.\n"
 msgstr[1] "S'ha esborrat %d signatura.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "invàlida"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "L'ID d'usuari «%s» està revocat."
 msgstr[1] "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5222,43 +5216,43 @@ msgstr ""
 "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:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 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:4719
+#: g10/keyedit.c:4611
 #, 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:4788
+#: g10/keyedit.c:4680
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5266,187 +5260,187 @@ msgid ""
 msgstr ""
 "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 #, 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:4796
+#: g10/keyedit.c:4688
 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:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 #, 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:4915
+#: g10/keyedit.c:4807
 #, 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:5033
+#: g10/keyedit.c:4925
 #, 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:5039
+#: g10/keyedit.c:4931
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, 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:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, 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:5896
+#: g10/keyedit.c:5790
 #, 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:5918
+#: g10/keyedit.c:5812
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 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:6078
+#: g10/keyedit.c:5972
 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:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, 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:6464
+#: g10/keyedit.c:6358
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5487,53 +5481,53 @@ msgstr "hi ha massa preferències «%c»\n"
 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:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "s'està escrivint una signatura directa\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "s'està escrivint l'autosignatura\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "s'està escrivint la signatura de comprovació de la clau\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, 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:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, 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:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 #, fuzzy
 msgid "Encrypt"
 msgstr "xifra dades"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr ""
 
@@ -5547,180 +5541,180 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, 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:2136
+#: g10/keygen.c:2113
 #, 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:2142
+#: g10/keygen.c:2119
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (només xifrar)\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, 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:2150
+#: g10/keygen.c:2127
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, 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:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (predeterminat)"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, 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:2161
+#: g10/keygen.c:2138
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, 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:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notació de signatura: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 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:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 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:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "desactiva una clau"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, 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:2570
+#: g10/keygen.c:2547
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2555
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Quina grandària voleu? (1024) "
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 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:2641
+#: g10/keygen.c:2618
 #, 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:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5736,7 +5730,7 @@ msgstr ""
 "      <n>m = la clau caduca als n mesos\n"
 "      <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5752,42 +5746,42 @@ msgstr ""
 "      <n>m = la signatura caduca als n mesos\n"
 "      <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, 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:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5795,12 +5789,12 @@ msgstr ""
 "El vostre sistema no pot representar dates posteriors a l'any 2038.\n"
 "Tanmateix, les tractarà bé fins l'any 2106.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "És correcte? (s/n)"
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5811,7 +5805,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 #, fuzzy
 msgid ""
 "\n"
@@ -5828,42 +5822,42 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "Adreça electrònica: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, 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:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5874,11 +5868,11 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5895,35 +5889,35 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 #, 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:3148
+#: g10/keygen.c:3125
 #, 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5935,18 +5929,18 @@ msgstr ""
 "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5954,70 +5948,70 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Voleu crear la clau de tota manera? "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Voleu crear la clau de tota manera? "
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "La generació de claus ha estat cancel·lada.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr ""
 
-#: g10/keygen.c:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, 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:5599
+#: g10/keygen.c:5570
 #, 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:5613
+#: g10/keygen.c:5584
 #, 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:5644
+#: g10/keygen.c:5615
 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:5660
+#: g10/keygen.c:5631
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -6027,7 +6021,7 @@ msgstr ""
 "\"--edit-key\" per a generar una clau secundària per a tal propòsit.\n"
 
 # Werner FIXME: Use ngettext. jm
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -6036,7 +6030,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -6044,23 +6038,23 @@ msgstr ""
 "la clau s'ha creat %lu segons en el futur (salt en el temps o problemes\n"
 "amb el rellotge)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
@@ -6069,27 +6063,43 @@ msgstr "Crear realment? "
 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"
@@ -6097,7 +6107,7 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d signatures errònies\n"
 msgstr[1] "%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"
@@ -6105,41 +6115,41 @@ msgid_plural "%d signatures not checked due to errors\n"
 msgstr[0] "1 signatura no comprovada a causa d'un error\n"
 msgstr[1] "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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Anell"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Empremtes digital de la clau primària:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr " Empremta digital de la clau primària:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "      Empremta digital de la subclau:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Empremta digital ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -6524,7 +6534,7 @@ msgstr "binari"
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "desconeguda"
 
@@ -6670,27 +6680,27 @@ msgstr "No comprimit"
 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:1614
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "la classe de signatura és desconeguda"
@@ -6813,7 +6823,7 @@ msgid ""
 "%s"
 msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6828,75 +6838,75 @@ msgstr ""
 "molt gran!\n"
 "Es recomana una imatge amb una mida aproximada de 240x288.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:207
 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:228
 #, 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:239
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:241
 #, 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:257
 #, 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:276
 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:421
 #, 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:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, 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:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6904,7 +6914,7 @@ msgstr ""
 "les crides a programes externs estan inhabilitades per tindre el fitxer "
 "d'opcions permissos insegurs\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "no s'ha pogut mostrar el photo ID!\n"
@@ -7235,12 +7245,12 @@ msgstr "el destinatari predeterminat és desconegut «%s»\n"
 msgid "no valid addressees\n"
 msgstr "no hi ha adreces vàlides\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "clau %08lX: sense ID\n"
@@ -8320,7 +8330,7 @@ msgstr ""
 "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"
@@ -8354,14 +8364,14 @@ msgstr "si us plau, feu un --check-trustdb\n"
 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"
 msgstr[0] "fins ara s'han processat %lu claus\n"
 msgstr[1] "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"
@@ -8369,24 +8379,24 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
 msgstr[1] "s'han processat %d claus (s'han netejat %d comptes de validesa)\n"
 
-#: g10/trustdb.c: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"
@@ -8516,7 +8526,7 @@ msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8524,7 +8534,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8560,7 +8570,7 @@ msgstr "canvia la contrasenya"
 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:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8646,75 +8656,75 @@ msgstr[1] "La generació de claus ha fallat: %s\n"
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "canvia la contrasenya"
 
-#: scd/app-nks.c:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1654
+#: 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:1701
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2074
+#: 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:2082
+#: 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:2092
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2102
+#: 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:2104
+#: 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:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error en crear «%s»: %s\n"
@@ -8981,13 +8991,13 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8996,11 +9006,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:199 sm/certchain.c:2211
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 #, fuzzy
 msgid "shell"
 msgstr "ajuda"
@@ -9024,248 +9034,248 @@ msgstr ""
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, 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:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:818
 #, 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:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, 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:1260 sm/certchain.c:1264
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: aquesta clau ha estat revocada!"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, 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:1337 sm/certchain.c:1422
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1338 sm/certchain.c:1423
 #, fuzzy
 msgid "intermediate certificate not yet valid"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1404
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "problema en la lectura del certificat: %s\n"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "        signatures noves: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Empremta digital:"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, 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:1505
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1511
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificat correcte"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1785 dirmngr/validate.c:576
 #, 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:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, 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:1844 dirmngr/validate.c:643
 #, 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:1879 dirmngr/validate.c:669
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verifica una signatura"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1911 dirmngr/validate.c:693
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certificat duplicat: esborrat"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, 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:2198
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9292,7 +9302,7 @@ msgstr "no forçat"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "no"
@@ -9339,42 +9349,42 @@ msgstr ""
 "«%2$.*1$s»\n"
 "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "bad certificate"
 msgid "looking for another certificate\n"
@@ -9939,7 +9949,7 @@ 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:916
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n"
@@ -10133,7 +10143,7 @@ msgstr "no s'ha pogut eliminar el bloc de claus: %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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -10386,203 +10396,203 @@ msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1849 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:1923
 #, 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:1938
 #, 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:1945
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1984
 #, 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:2011
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "Certificat correcte"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, 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:2084
 #, 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:2226
 #, 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:2233
 #, 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:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, 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:2301
 #, 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:2308
 #, 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:2333
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, 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:2414
 #, 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:2446
 #, 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:2460
 #, 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:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 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:2523
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, 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:2558
 #, 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:2569
 #, 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:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, 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:2779
+#: dirmngr/crlcache.c:2780
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
@@ -10951,12 +10961,12 @@ msgstr "forma d'ús: gpg [opcions] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
@@ -11210,92 +11220,92 @@ msgstr "no s'han pogut canviar els permissos de «%s»: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:582
+#: 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:598 dirmngr/ocsp.c:782
+#: 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:642
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "Certificat de revocació vàlid"
 
-#: dirmngr/ocsp.c:691
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:698
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "Certificat correcte"
 
-#: dirmngr/ocsp.c:708
+#: 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:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:753
+#: 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:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:765
+#: 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:822
+#: 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:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11309,64 +11319,64 @@ msgstr "Ha fallat el procés de signatura: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, 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:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, 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:1743
 #, 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:1776
 #, 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:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, 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:3054
+#: dirmngr/server.c:3070
 #, 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:3062
+#: dirmngr/server.c:3078
 #, 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:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11684,87 +11694,102 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "S'ha creat el certificat de revocació.\n"
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: 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:3706
+#: 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:3707
+#: 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:3708
+#: 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:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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 "
@@ -13443,9 +13468,6 @@ msgstr ""
 #~ msgid "delete signatures"
 #~ msgstr "esborra signatures"
 
-#~ msgid "set preference list"
-#~ msgstr "estableix la llista de preferències"
-
 #~ msgid "updated preferences"
 #~ msgstr "preferències actualitzades"
 
diff --git a/po/cs.gmo b/po/cs.gmo
index 5202fc2..e3707bc 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index fc03353..924d98e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -28,6 +28,7 @@
 # action → způsob užití (klí�e)
 # administrator → správce
 # cache → keš
+# compliance rules → pravidla normy
 # distribution point → místo distribuce
 # DP (distribution point (of CRL)) → DP
 # load → zavést
@@ -37,10 +38,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg2 2.3.4\n"
+"Project-Id-Version: gnupg2 2.3.8\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
-"PO-Revision-Date: 2022-02-20 16:09+01:00\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
+"PO-Revision-Date: 2022-11-13 14:21+01:00\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <gnupg-i18n@gnupg.org>\n"
 "Language: cs\n"
@@ -172,8 +173,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Heslo:"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "neshodují se – zkuste to znovu"
 
@@ -222,17 +223,17 @@ msgstr "Poznámka: Požadavek z webového prohlíže�e."
 msgid "Note: Request from a remote site."
 msgstr "Poznámka: Požadavek ze vzdálené strany."
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, 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:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Prosím, zadejte toto heslo znovu"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -240,7 +241,7 @@ msgid ""
 msgstr ""
 "Prosím, zadejte heslo, abyste ochránili importovaný objekt uvnitř systému %s."
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -253,25 +254,25 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "nelze otevřít „%s“: %s\n"
@@ -281,12 +282,12 @@ msgstr "nelze otevřít „%s“: %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "nenalezen žádný vhodný klí� karty: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, 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:2777
+#: agent/command-ssh.c:2782
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -295,20 +296,20 @@ msgstr ""
 "Proces SSH si vyžádal použití klí�e%%0A  %s%%0A  (%s)%%0APřejete si to "
 "povolit?"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Povolit"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Zakázat"
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Prosím, zadejte heslo pro SSH klí�%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3100
+#: agent/command-ssh.c:3105
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -317,7 +318,7 @@ msgstr ""
 "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:3797
+#: agent/command-ssh.c:3837
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "ze socketu se nepodařilo se vytvořit proud (stream): %s\n"
@@ -374,10 +375,9 @@ msgid "Please enter the PIN%s%s%s to unlock the card"
 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"
+#, 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
 msgid "Enter new passphrase"
@@ -443,194 +443,198 @@ msgstr "Pro ochranu svého nového klí�e,%0Aprosím, zadejte heslo"
 msgid "Please enter the new passphrase"
 msgstr "Prosím, zadejte nové heslo"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr "Volby ovlivňující spuštění"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr "poběží v režimu démona (na pozadí)"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr "poběží v režimu serveru (na popředí)"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "neodpojovat se od konzole"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr "vypisovat příkazy ve stylu sh"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr "vypisovat příkazy ve stylu csh"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 msgid "|FILE|read options from FILE"
 msgstr "|SOUBOR|na�íst volby ze SOUBORU"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr "Volby ovlivňující diagnostický výstup"
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "upovídaný režim"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "být o trochu víc tichý"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|SOUBOR|protokol z režimu serveru se zapíše do SOUBORU"
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr "Volby ovlivňující nastavení"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 msgid "do not use the SCdaemon"
 msgstr "nepoužívat SCdémona"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PROGRAM|použít PROGRAM jako program SCdaemon"
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PROGRAM|použít PROGRAM jako program tpm2daemon"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 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:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr "ignorovat požadavky na změnu TTY"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr "ignorovat požadavky na změnu X displeje"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 msgid "enable ssh support"
 msgstr "zapnout podporu pro OpenSSH"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGORITMUS|ukazovat otisky SSH pomocí ALGORITMU"
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 msgid "enable putty support"
 msgstr "zapnout podporu pro PuTTY"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+msgid "enable Win32-OpenSSH support"
+msgstr "zapnout podporu pro Win32-OpenSSH"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "Volby ovlivňující bezpe�nost"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|zahodit zapamatované PINy po N sekundách"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|zahazovat klí�e SSH po N sekundách"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 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:248
+#: agent/gpg-agent.c:256
 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:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr "nepoužívat paměť PINů na podepisování"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 msgid "disallow the use of an external password cache"
 msgstr "nedovolit použít vnější úložiště na hesla"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "nedovolit klientům ozna�ovat klí�e za „důvěryhodné“"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 msgid "allow presetting passphrase"
 msgstr "umožnit přednastavení hesla"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr "Volby vynucující politiku hesel"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr "nedovolit obejití politiky hesel"
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 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:271
+#: agent/gpg-agent.c:279
 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:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|SOUBOR|prověřovat nová hesla proti vzorům v SOUBORU"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|omezit platnost hesla na N dnů"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 msgid "do not allow the reuse of old passphrases"
 msgstr "nedovolit opakovat stará hesla"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr "Volby ovlivňující pinentry"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 msgid "never use the PIN-entry"
 msgstr "nikdy nepoužít pinentry"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr "znemožnit volajícímu přebít pinentry"
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "dovolit pinetry uzurpovat si klávesnici a myš"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PROGRAM|použít PROGRAM jako PIN-Entry program"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|nastavit �asový limit pro Pinentry na N sekund"
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
@@ -639,11 +643,11 @@ 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:570
+#: agent/gpg-agent.c:582
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Použití: @GPG_AGENT@ [volby] (-h pro nápovědu)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -651,135 +655,135 @@ msgstr ""
 "Syntaxe: @GPG_AGENT@ [volby] [příkaz [argumenty]]\n"
 "Správa tajných klí�ů pro @GNUPG@\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "zadána neplatná úroveň ladění „%s“\n"
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "�tou se možnosti z „%s“\n"
 
-#: agent/gpg-agent.c:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "POZOR: používání parametru „%s“ se nedoporu�uje\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "socket nelze vytvořit: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "název socketu „%s“ je příliš dlouhý\n"
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "zkouší se ukrást socket z běžícího programu %s\n"
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, 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:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, 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:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, 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:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "naslouchá se na socketu „%s“\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "nelze vytvořit adresář „%s“: %s\n"
 
-#: agent/gpg-agent.c:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "adresář „%s“ vytvořen\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "volání stat() na „%s“ selhalo: %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "„%s“ nelze použít jako domovský adresář\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, 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:2768
+#: agent/gpg-agent.c:2882
 #, 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:2773
+#: agent/gpg-agent.c:2887
 #, 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:2848
+#: agent/gpg-agent.c:2962
 #, 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:2853
+#: agent/gpg-agent.c:2967
 #, 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:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect selhala: %s – �eká se 1 s\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s pozastaveno\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -994,14 +998,9 @@ msgid "Please insert the card with serial number"
 msgstr "Prosím, vložte kartu se sériovým �íslem"
 
 #: agent/findkey.c:1231
-#, fuzzy, c-format
-#| msgid ""
-#| "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want "
-#| "to allow this?"
+#, c-format
 msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
-msgstr ""
-"Proces SSH si vyžádal použití klí�e%%0A  %s%%0A  (%s)%%0APřejete si to "
-"povolit?"
+msgstr "Vyžádáno použití klí�e%%0A  %s%%0A  %s%%0APřejete si to povolit?"
 
 #: agent/findkey.c:1737
 #, c-format
@@ -1049,7 +1048,7 @@ msgstr "kontrola vytvořeného podpisu se nepodařila: %s\n"
 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:1602
 #, 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 +1063,52 @@ msgstr "ochranný algoritmus %d (%s) není podporován\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1141,18 +1140,18 @@ msgstr "Varování: vlastnictví %s „%s“ není nastaveno bezpe�ně\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Varování: přístupová práva %s „%s“ nejsou bezpe�ná\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "�ekání, až se soubor „%s“ stane přístupným…\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "přejmenování „%s“ na „%s“ se nezdařilo: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "ano"
 
@@ -1206,8 +1205,8 @@ msgstr "při pokusu alokovat %lu bajtů došla bezpe�ná paměť"
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1227,68 +1226,68 @@ msgstr "POZOR: „%s%s“ je zastaralý parametr – neú�inkuje\n"
 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
+#: common/asshelp.c:344
 #, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "�eká se, až naběhne keyboxd… (%d s)\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, c-format
 msgid "waiting for the agent to come up ... (%ds)\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í s dirmngr ustanoveno\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, c-format
 msgid "connection to the keyboxd established\n"
 msgstr "spojení s keyboxd ustanoveno\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, c-format
 msgid "connection to the agent established\n"
 msgstr "spojení s agentem ustanoveno\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "žádný %s neběží – spouští se „%s“\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, c-format
 msgid "connection to the agent is in restricted mode\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:432 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 "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"
@@ -1436,11 +1435,11 @@ msgstr "Řetěz certifikátů je platný"
 msgid "Root certificate trustworthy"
 msgstr "Kořenový certifikát je důvěryhodný"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 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:1115 sm/certchain.c:1284
 msgid "the available CRL is too old"
 msgstr "dostupný CRL je příliš starý"
 
@@ -1477,7 +1476,7 @@ msgstr "Nápověda pro „%s“ není dostupná.'"
 msgid "ignoring garbage line"
 msgstr "ignoruji řádek s nepořádkem"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "[none]"
 msgstr "[neuvedeno]"
 
@@ -1521,36 +1520,36 @@ msgstr "iconv_open selhala: %s\n"
 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
 #, 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"
@@ -1561,92 +1560,92 @@ msgstr "�ekám na zámek %s…\n"
 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
+#: 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"
@@ -1655,12 +1654,12 @@ msgstr ""
 "špatný MTA\n"
 
 # TODO: Pluralize
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, c-format
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "[ ne�itelné pro lidi (%zu bajtů: %s%s) ]"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1669,32 +1668,32 @@ msgstr ""
 "symbolické jméno smí obsahovat pouze písmena, �íslice, te�ky nebo podtržítka "
 "a musí kon�it znakem „=“\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, 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:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, 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:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "POZOR: nalezen neplatný formát zápisu data\n"
@@ -1708,7 +1707,7 @@ msgstr "předání dotazu %s klientovi se nezdařilo\n"
 msgid "Enter passphrase: "
 msgstr "Vložte heslo: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 g10/sign.c:473
 #: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
@@ -1725,7 +1724,7 @@ msgstr "chyba z TPM: %s\n"
 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:2330
+#: 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"
@@ -1764,169 +1763,169 @@ msgstr "nepřijatelné přesměrování HTTP serverem bylo odklizeno"
 msgid "server uses an invalid certificate"
 msgstr "server používá neplatný certifikát"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "Pan"
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "Paní"
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: 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:1498
+#: g10/card-util.c:801 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:1500
+#: g10/card-util.c:803 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:1502
+#: g10/card-util.c:805 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:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Příjmení držitele karty: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 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:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Login (jménu ú�tu): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Privátní DO data: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Jazykové předvolby: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 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:1800
+#: g10/card-util.c:1199 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Chyba: neplatná odpově�.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "Otisk CA: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 msgid "not an OpenPGP card"
 msgstr "toto není OpenPGP karta"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr "Přepsat existující klí�? (a/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -1938,99 +1937,99 @@ msgstr ""
 "          do dokumentace své karty, kde se dozvíte, jaké druhy a velikosti\n"
 "          jsou dovoleny.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 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:1472
 msgid "Signature key\n"
 msgstr "Podepisovací klí�\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 msgid "Encryption key\n"
 msgstr "Šifrovací klí�\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr "Autentiza�ní klí�\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Neplatný výběr.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 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:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2041,179 +2040,179 @@ msgstr ""
 "   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:1741
 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:1743 g10/card-util.c:1833
 msgid "   (1) Signature key\n"
 msgstr "   (1) Podepisovací klí�\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1744 g10/card-util.c:1835
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Šifrovací klí�\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�ní klí�\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 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:1876
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Volání KEYTOCARD selhalo: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 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:2182
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "chyba při nastavování KDF: %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2228
 #, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "chyba při nastavování UIF: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "ukon�í tuto nabídku"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr "ukáže příkazy pro správce"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "ukáže tuto nápovědu"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "vypíše všechna dostupná data"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3687
+#: g10/card-util.c:2260 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:3688
+#: g10/card-util.c:2261 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:3689
+#: g10/card-util.c:2262 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:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "změní přihlašovací jméno"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "změní jazykové předvolby"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 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:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "změní otisk certifika�ní autority"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "přepne příznak požadování PINu při každém podpisu"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "vytvoří nové klí�e"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 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:3698
+#: g10/card-util.c:2271 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "ověří PIN a vypíše všechna data"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "odblokuje PIN pomocí reseta�ního kódu"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr "zni�í všechny klí�e a data"
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr ""
 "nastaví KDF pro autentizaci kódem PIN (on [zapnuto], single [jediný], off "
 "[vypnuto])"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2276
 msgid "change the key attribute"
 msgstr "změní atribut klí�e"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 tools/gpg-card.c:3763
 msgid "change the User Interaction Flag"
 msgstr "změní příznak interakce uživatele (UIF)"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/karta> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 msgid "Admin-only command\n"
 msgstr "Pouze příkazy správce\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr "Příkazy správce jsou povoleny\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 msgid "Admin commands are not allowed\n"
 msgstr "Příkazy správce nejsou povoleny\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento příkaz není platný\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2276,9 +2275,9 @@ msgstr "klí�e"
 msgid "subkey"
 msgstr "podklí�e"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
@@ -2311,18 +2310,18 @@ msgid ""
 msgstr ""
 "POZOR: vyžádaná symetrická šifra %s (%d) nevyhovuje předvolbám příjemce\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, c-format
 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr "(přebijete přepína�em „%s“)\n"
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, 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"
@@ -2332,43 +2331,43 @@ msgstr "šifrovací algoritmus „%s“ se nesmí používat v režimu %s\n"
 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:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba při vytváření hesla: %s\n"
 
-#: g10/encrypt.c:481
+#: g10/encrypt.c:473
 #, 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 režimu S2K nelze použít symetrický ESK paket\n"
 
-#: g10/encrypt.c:512
+#: g10/encrypt.c:503
 #, c-format
 msgid "using cipher %s.%s\n"
 msgstr "použití šifry %s.%s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "„%s“ je již zkomprimován\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "POZOR: soubor „%s“ je prázdný\n"
 
-#: g10/encrypt.c:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "hashovací algoritmus „%s“ se nesmí používat v režimu %s\n"
 
-#: g10/encrypt.c:862
+#: g10/encrypt.c:853
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "�te se z „%s“\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2377,21 +2376,20 @@ msgstr ""
 "POZOR: vyžádaný komprima�ní algoritmus %s (%d) nevyhovuje předvolbám "
 "příjemce\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, c-format
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "zašifrováno pomocí %s/%s.%s pro: „%s“\n"
 
-#: g10/encrypt.c:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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.%s encrypted data\n"
+#, c-format
 msgid "%s encrypted data\n"
-msgstr "data zašifrovaná pomocí %s.%s\n"
+msgstr "data zašifrovaná pomocí %s\n"
 
 #: g10/decrypt-data.c:248
 #, c-format
@@ -2409,62 +2407,74 @@ msgstr "POZOR: zpráva byla zašifrována slabým klí�em v symetrické šifře
 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
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "vytvořit revoka�ní certifikát"
+
+#: 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
+#, fuzzy
+#| msgid "exporting secret keys not allowed\n"
+msgid "export secret keys using the GnuPG format"
+msgstr "exportování tajného klí�e není povoleno\n"
+
+#: 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "POZOR: nebylo nic vyexportováno\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2529,7 +2539,7 @@ msgstr "Neplatný klí� %s změněn na platný pomocí --always-non-selfsigned-
 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:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "platné hodnoty pro volbu „%s“:\n"
@@ -2602,111 +2612,111 @@ msgstr "rychle odvolat identitu uživatele"
 msgid "quickly set a new expiration date"
 msgstr "rychle nastavit nové datum konce platnosti"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr "komplexní vytvoření páru klí�ů"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "vytvořit revoka�ní certifikát"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "odstranit klí� ze souboru veřejných klí�ů"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "odstranit klí� ze souboru tajných klí�ů"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "quickly sign a key"
 msgstr "rychle podepsat klí�"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 msgid "quickly sign a key locally"
 msgstr "rychle lokálně podepsat klí�"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "quickly revoke a key signature"
 msgstr "rychle odvolat podpis klí�e"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "podepsat klí�"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "podepsat klí� lokálně"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat klí�"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "změnit heslo"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "exportovat klí�e"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "exportovat klí�e na server klí�ů"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "importovat klí�e ze serveru klí�ů"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "vyhledat klí�e na serveru klí�ů"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat všechny klí�e ze serveru klí�ů"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "importovat/slou�it klí�e"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr "vytisknout stav karty"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr "změnit data na kartě"
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr "změnit PIN karty"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "aktualizovat databázi důvěry"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 msgid "print message digests"
 msgstr "vypsat hash zprávy"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "pracovat v režimu serveru"
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|HODNOTA|nastavit TOFU politiku klí�i"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|N�ZEV|použít N�ZEV jako implicitní tajný klí�"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|JMÉNO|šifrovat rovněž pro uživatele s ID JMÉNO"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|nastavit e-mailový alias"
 
@@ -2722,51 +2732,51 @@ msgstr "neprovádět žádné změny"
 msgid "prompt before overwriting"
 msgstr "vyžádat potvrzení před přepsáním"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr "Volby ovlivňující vstup"
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr "Volby ovlivňující výstup"
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "vytvořit výstup zapsaný v ASCII"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|SOUBOR|zapsat výstup do SOUBORU"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "použít kanonický textový režim"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nastavit úroveň komprese na N (0 – žádná)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr "Volby ovlivňující import a export klí�e"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 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:776
+#: g10/gpg.c:775
 msgid "import missing key from a signature"
 msgstr "importovat chybějící klí� z podpisu"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 msgid "include the public key in signatures"
 msgstr "zahrnovat veřejný klí� do podpisů"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "zakázat veškerý přístup k dirmngr"
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr "Volby ovlivňující výpis klí�ů"
 
@@ -2790,7 +2800,7 @@ msgstr "Volby pro dávkový režim"
 msgid "Other options"
 msgstr "Ostatní volby"
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2798,7 +2808,7 @@ msgstr ""
 "@\n"
 "(Pro úplný seznam všech příkazů a voleb nahlédněte do manuálové stránky.)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2818,11 +2828,11 @@ msgstr ""
 " --list-keys [jména]        ukázat klí�e\n"
 " --fingerprint [jména]      ukázat otisky\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Použití: @GPG@ [možnosti] [soubory] (-h pro nápovědu)"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1172
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2832,7 +2842,7 @@ msgstr ""
 "Podepisuje, ověřuje, šifruje nebo dešifruje.\n"
 "Výchozí operace závisí na vstupních datech.\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2840,76 +2850,76 @@ msgstr ""
 "\n"
 "Podporované algoritmy:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Veřejný klí�: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Å ifra: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "použití: %s [přepína�e] %s\n"
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "konfliktní příkazy\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = podpis nalezen v definici skupiny „%s“\n"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1698
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "POZOR: vlastnictví domovského adresáře „%s“ není nastaveno bezpe�ně\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr ""
 "POZOR: vlastnictví konfigura�ního souboru „%s“ není nastaveno bezpe�ně\n"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "POZOR: vlastnictví rozšiřujícího modulu „%s“ není nastaveno bezpe�ně\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "POZOR: přístupová práva pro domovský adresář „%s“ nejsou bezpe�ná\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "POZOR: přístupová práva pro konfigura�ní soubor „%s“ nejsou bezpe�ná\n"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "POZOR: přístupová práva rozšiřujícímu modulu „%s“ nejsou bezpe�ná\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "POZOR: vlastnictví adresáře s domovským adresářem „%s“ není nastaveno "
 "nebezpe�ně\n"
 
-#: g10/gpg.c:1735
+#: g10/gpg.c:1725
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2917,21 +2927,21 @@ msgstr ""
 "POZOR: vlastnictví adresáře „%s“ s konfigura�ním souborem není nastaveno "
 "nebezpe�ně\n"
 
-#: g10/gpg.c:1738
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "POZOR: vlastnictví adresáře „%s“ s rozšiřujícím modulem není nastaveno "
 "nebezpe�ně\n"
 
-#: g10/gpg.c:1744
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "POZOR: přístupová práva k adresáři „%s“ s domovským adresářem nejsou "
 "nastavena bezpe�ně\n"
 
-#: g10/gpg.c:1747
+#: g10/gpg.c:1737
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2939,7 +2949,7 @@ msgstr ""
 "POZOR: přístupová práva k adresáři „%s“ s konfigura�ním souborem nejsou "
 "nastavena bezpe�ně\n"
 
-#: g10/gpg.c:1750
+#: g10/gpg.c:1740
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
@@ -2947,466 +2957,457 @@ msgstr ""
 "nastavena bezpe�ně\n"
 
 # c-format
-#: g10/gpg.c:1966
+#: g10/gpg.c:1956
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "neznámá konfigura�ní položka „%s“\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr "zobrazovat ID fotografií během výpisu klí�ů"
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 msgid "show key usage information during key listings"
 msgstr "ukazovat údaje o ú�elu klí�e při výpisu klí�ů"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr "ukazovat URL politik během výpisu podpisů"
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 msgid "show all notations during signature listings"
 msgstr "ukazovat všechny poznámky během výpisu podpisů"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr "ukazovat poznámky IETF standardu během vypisování podpisů"
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr "ukazovat uživatelské poznámky během výpisu podpisů"
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 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:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr "ukazovat platnost ID uživatelů při výpisu klí�ů"
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 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:2082
+#: g10/gpg.c:2072
 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:2084
+#: g10/gpg.c:2074
 msgid "show the keyring name in key listings"
 msgstr "ukazovat název souboru s klí�i při výpisu klí�ů"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 msgid "show expiration dates during signature listings"
 msgstr "ukazovat data expirace během výpisu podpisů"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "vypsat seznam předvoleb (pro experty)"
+
+#: g10/gpg.c:2197
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "neznámá TOFU politika „%s“\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(možnosti lze vypsat příkazem „help“)\n"
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, 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:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "„%s“ není platná doba expirace podpisu\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "„%s“ není správná e-mailová adresa\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "neplatný režim pinentry „%s“\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "neplatný původ požadavku „%s“\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "„%s“ není platná znaková sada\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru klí�ů\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatný parametr pro server klí�ů\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "neplatný parametr pro server klí�ů\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatný parametr pro import\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "neplatný parametr pro import\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "neplatná volba filtru: %s\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatný parametr pro export\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "neplatný parametr pro export\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatný parametr pro výpis\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr "neplatný parametr pro výpis\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr "zobrazovat ID fotografií při ověřování podpisu"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr "ukazovat URL politik při ověřování podpisu"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 msgid "show all notations during signature verification"
 msgstr "ukazovat všechny poznámky při ověřování podpisu"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 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:3420
+#: g10/gpg.c:3396
 msgid "show user ID validity during signature verification"
 msgstr "ukazovat platnost ID uživatele při ověřování podpisu"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 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:3424
+#: g10/gpg.c:3400
 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:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatný parametr pro ověření\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr "neplatný parametr pro ověření\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatný seznam auto-key-locate\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "neplatný seznam auto-key-locate\n"
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "neplatný argument u volby „%.50s“\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "POZOR: program může vytvořit soubor core!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "POZOR: %s přepíše %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Není dovoleno používat %s s %s!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedává s %s smysl!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "POZOR: pracuji s podvrženým systémovým �asem: "
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, 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:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3952
-#, c-format
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "vybraný algoritmus AEAD je neplatný\n"
-
-#: g10/gpg.c:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybraný kompresní algoritmus je neplatný\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, 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:3987
+#: g10/gpg.c:3950
 #, 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:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "neplatné implicitní předvolby\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatné uživatelské předvolby pro šifrování\n"
 
-#: g10/gpg.c:4015
-#, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr "neplatné uživatelské předvolby pro AEAD\n"
-
-#: g10/gpg.c:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "neplatné uživatelské předvolby pro hashování\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "neplatné uživatelské předvolby pro komprimaci\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "neplatná velikost bloku – použije se %d\n"
 
-#: g10/gpg.c:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud není funk�ní s %s\n"
 
-#: g10/gpg.c:4137
-#, c-format
-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"
-
-#: g10/gpg.c:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat databázi důvěry: %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "POZOR: specifikován adresát (-r) bez použití šifrování s veřejným klí�em\n"
 
-#: g10/gpg.c:4388
+#: g10/gpg.c:4336
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symetrické šifrování „%s“ se nepovedlo: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, 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:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, 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:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 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:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "získání dat z serveru klí�ů se nezdařilo: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export klí�e se nepodařil: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export jako SSH klí� se nepodařil: %s\n"
 
-#: g10/gpg.c:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hledání na serveru klí�ů se nezdařilo: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "obnovení dat na serveru klí�ů se nezdařilo: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódování z ASCII formátu selhalo: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódování do ASCII formátu selhalo: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "neplatný hashovací algoritmus „%s“\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, 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:5366
+#: g10/gpg.c:5322
 #, 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:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�něte psát svou zprávu…\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadané URL pro certifika�ní politiku je neplatné\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadané URL pro podepisovací politiku je neplatné\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadané URL preferovaného serveru klí�ů je neplatné\n"
@@ -3419,7 +3420,7 @@ msgstr "|SOUBOR|brát klí�e z klí�enky (keyringu) SOUBOR"
 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:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 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"
 
@@ -3448,153 +3449,153 @@ msgstr "Nápověda není k dispozici"
 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
+#: g10/import.c:182
 msgid "enable bulk import mode"
 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
+#: g10/import.c:188
 msgid "show key but do not actually import"
 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"
@@ -3603,173 +3604,173 @@ msgstr ""
 "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
+#: g10/import.c:1360
 #, c-format
 msgid "         \"%s\": preference for AEAD algorithm %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 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:1998 g10/import.c:3146
 #, 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:2004
 #, c-format
 msgid "key %s: %s\n"
 msgstr "klí� %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr "zamítnut kontrolou při importu"
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, 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:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "klí� %s: tajný klí� importován\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, 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:2801
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "klí� %s: chyba při odesílání dat agentovi: %s\n"
@@ -3782,198 +3783,198 @@ msgstr "klí� %s: chyba při odesílání dat agentovi: %s\n"
 #. * 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:2970
 #, 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:3117
 #, 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:3138 g10/import.c:3177
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "import tajných klí�ů není povolen\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "důvod pro revokaci: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "revoka�ní poznámka: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klí� %s: neplatná vazba podklí�e\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3788
 #, 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:3812
 #, 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:3825
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klí� %s: neplatný odvolací podklí�\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3840
 #, 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:3887
 #, 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:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klí� %s: podklí� přesko�en\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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
+#: g10/import.c:4297
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "klí� %s: objeveny duplikované podklí�e – slou�eny\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4362
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %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:4378
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "POZOR: klí� %s může být odvolán: revoka�ní klí� %s nenalezen.\n"
 
-#: g10/import.c:4351
+#: g10/import.c:4444
 #, 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:4482
 #, 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"
@@ -4015,7 +4016,7 @@ msgstr[0] "%d duplicitní podpis odstraněn\n"
 msgstr[1] "%d duplicitní podpisy odstraněny\n"
 msgstr[2] "%d duplicitních podpisů odstraněno\n"
 
-#: g10/key-check.c:726 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"
@@ -4023,7 +4024,7 @@ msgstr[0] "%d podpis neověřen, protože chybí klí�\n"
 msgstr[1] "%d podpisy neověřeny, protože chybí klí�e\n"
 msgstr[2] "%d podpisů neověřeno, protože chybí klí�e\n"
 
-#: g10/key-check.c:734 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"
@@ -4078,15 +4079,15 @@ msgstr "zdroj bloku klí�e „%s“: %s\n"
 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:262
 msgid "[revocation]"
 msgstr "[odvolání]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[podpis klí�e jím samým]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4098,17 +4099,17 @@ msgstr ""
 "kontrolou otisků z různých zdrojů…)?\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 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:390 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:408
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4118,52 +4119,52 @@ msgstr ""
 "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:425
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "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:553
 #, 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:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Vypršela platnost uživatelského ID „%s“."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, 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:646
 #, 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:648
 msgid "Sign it? (y/N) "
 msgstr "Podepsat? (a/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4172,11 +4173,11 @@ msgstr ""
 "Podpis klí�e „%s“ jím samým je\n"
 "podpis formátu PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4185,13 +4186,13 @@ msgstr ""
 "Platnost vašeho podpisu na „%s“\n"
 "vypršela.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4200,43 +4201,43 @@ msgstr ""
 "Váš sou�asný podpis na „%s“\n"
 "je pouze lokální.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "Platnost klí�e vypršela!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4246,31 +4247,31 @@ msgstr ""
 "patří výše uvedené osobě.\n"
 "Pokud neznáte odpově�, zadejte „0“.\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpovím.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, 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:878
 #, 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:881
 #, 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:888
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Váš výběr? (pro podrobnosti zadejte „?“): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4279,229 +4280,229 @@ msgstr ""
 "Jste si jistý(á), že chcete podepsat tento klí�\n"
 "svým klí�em „%s“ (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 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:928
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "POZOR: podpis nebude ozna�en jako neexportovatelný.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "POZOR: podpis nebude ozna�en jako neodvolatelný (non-revocable).\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:945
 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:952
 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:959
 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:964
 msgid "I have checked this key casually.\n"
 msgstr "Částe�ně jsem ověřil tento klí�.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 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:981
 msgid "Really sign? (y/N) "
 msgstr "Skute�ně podepsat? (a/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podepsání selhalo: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 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:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "uložit a ukon�it"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 msgid "show key fingerprint"
 msgstr "vypsat otisk klí�e"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "show the keygrip"
 msgstr "ukázat keygrip"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "vypsat seznam klí�ů a id uživatelů"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "vyberte identifikátor uživatele N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr "vyberte podklí� N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr "kontrolovat podpisy"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 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:1286
 msgid "sign selected user IDs locally"
 msgstr "podepsat vybrané uživatelské ID lokálně"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 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:1289
 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:1291
 msgid "add a user ID"
 msgstr "přidat identifikátor uživatele"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "přidat fotografický ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr "smazat vybrané ID uživatele"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr "přidat podklí�"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr "přidat klí� na kartu"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr "přesunout klí� na kartu"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr "převést klí� do formátu TPM pomocí místního TPM"
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr "přesunout záložní klí� na kartu"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 msgid "delete selected subkeys"
 msgstr "smazat vybrané podklí�e"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "přidat revoka�ní klí�"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 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:1314
 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:1316
 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:1319
 msgid "list preferences (expert)"
 msgstr "vypsat seznam předvoleb (pro experty)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam předvoleb (podrobně)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 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:1325
 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:1327
 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:1329
 msgid "change the passphrase"
 msgstr "změnit heslo"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "změnit důvěryhodnost vlastníka klí�e"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 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:1337
 msgid "revoke selected user IDs"
 msgstr "revokovat vybrané uživatelské ID"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "revoke key or selected subkeys"
 msgstr "revokovat klí� nebo vybrané podklí�e"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "enable key"
 msgstr "nastavit klí� jako platný (enable)"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr "nastavit klí� jako neplatný (disable)"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr "ukázat vybrané fotografické ID"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 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:1349
 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:1470
 msgid "Secret key is available.\n"
 msgstr "Tajný klí� je dostupný.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 msgid "Secret subkeys are available.\n"
 msgstr "Tajné podklí�e jsou dostupné.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1574
 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:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4512,285 +4513,269 @@ msgstr ""
 "  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:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "Klí� je odvolán."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 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:1682
 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:1690
 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:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Použijte příkaz „%s“.)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 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:1756
 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:1814 g10/keyedit.c:1854
 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 msgid "You must select exactly one key.\n"
 msgstr "Musíte vybrat právě jeden klí�.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 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:1915
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "Nelze otevřít „%s“: %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, 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:1969
 msgid "You must select at least one key.\n"
 msgstr "Musíte vybrat alespoň jeden klí�.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1975
 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:1977
 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:2015
 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:2016
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Opravdu odvolat toto ID uživatele? (a/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2034
 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:2045
 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:2047
 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:2105
 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:2150
 msgid "Set preference list to:\n"
 msgstr "Nastavit seznam předvoleb:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 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:2159
 msgid "Really update the preferences? (y/N) "
 msgstr "Opravdu aktualizovat předvolby? (a/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Save changes? (y/N) "
 msgstr "Uložit změny? (a/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�it bez uložení? (a/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, 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:2557
+#: g10/keyedit.c:2558
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "poslední platné ID uživatele nelze odvolat.\n"
 
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2584
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "odvolání ID uživatele se nepodařilo: %s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, 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:2677
+#: g10/keyedit.c:2717
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "„%s“ není otisk\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "„%s“ není primární otisk\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Neplatné ID uživatele „%s“: %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "No matching user IDs."
 msgstr "Žádný identifikátor uživatele neodpovídá."
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "Nothing to sign.\n"
 msgstr "Nic na podepsání.\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Nepodepsáno vámi.\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "odvolat podpis klí�e se nepodařilo: %s\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3251
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "„%s“ není platná doba expirace\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "„%s“ není řádný otisk\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "podklí� „%s“ nenalezen\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr "AEAD: "
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Hash: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Vlastnosti: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr "Keyserver bez modifikace"
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Preferovaný keyserver: "
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr "Poznámky: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr "(citlivá informace)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "vytvořen: %s"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr "odvolán: %s"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skon�ila: %s"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skon�í: %s"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr "použití: %s"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr "�íslo karty: "
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr "důvěra: %s"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Tento klí� byl ozna�en za neplatný (disabled)"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4799,17 +4784,17 @@ msgstr ""
 "být nutně správné, dokud znova nespustíte program.\n"
 
 # status
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 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:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4818,17 +4803,17 @@ msgstr ""
 "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:4253
+#: g10/keyedit.c:4145
 #, 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:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4837,37 +4822,35 @@ msgstr ""
 "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:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 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:4324
+#: g10/keyedit.c:4216
 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:4339
-#, fuzzy
-#| msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4231
 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:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobrý podpis? (a/N/u)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatný podpis? (a/N/u)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento neznámý podpis? (a/N/u)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4875,20 +4858,20 @@ msgstr[0] "Smazán %d podpis.\n"
 msgstr[1] "Smazány %d podpisy.\n"
 msgstr[2] "Smazáno %d podpisů.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smazáno.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "neplatný"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uživatelské ID „%s“ směstnáno: %s\n"
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4896,17 +4879,17 @@ msgstr[0] "Uživatelské ID „%s“: odstraněn %d podpis\n"
 msgstr[1] "Uživatelské ID „%s“: odstraněny %d podpisy\n"
 msgstr[2] "Uživatelské ID „%s“: odstraněno %d podpisů\n"
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uživatelské ID „%s“: je již minimalizované\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uživatelské ID „%s“: je již odstraněné\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4915,209 +4898,209 @@ msgstr ""
 "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:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vložte identifikátor pověřeného odvolatele: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "POZOR: ustanovení klí�e pověřeným odvolatelem je nevratná operace!\n"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4611
 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:4788
+#: g10/keyedit.c:4680
 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:4793
+#: g10/keyedit.c:4685
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Měním dobu expirace podklí�e.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Měním dobu expirace primárního klí�e.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 msgid "Changing usage of a subkey.\n"
 msgstr "Mění se ú�el podklí�e.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 msgid "Changing usage of the primary key.\n"
 msgstr "Mění se ú�el primárního klí�e.\n"
 
-#: g10/keyedit.c:5033
+#: g10/keyedit.c:4925
 #, 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:5039
+#: g10/keyedit.c:4931
 #, 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:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosím, vyberte právě jeden id uživatele .\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, 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:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vložte URL preferovaného serveru klí�ů: "
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 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:5451
+#: g10/keyedit.c:5345
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jistý(á), že jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 msgid "Enter the notation: "
 msgstr "Vložte poznámku: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 msgid "Proceed? (y/N) "
 msgstr "Pokra�ovat (a/N)? "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifikátor uživatele s indexem %d\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje uživatelské ID s hashem %s\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Neexistuje podklí� s ID klí�e „%s“.\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podklí� s indexem %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID uživatele: „%s“\n"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (neexportovatelné)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vyprší %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 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:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvořit pro tento podpis odvolací certifikát? (a/N)"
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr " (neodvolatelné)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, 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:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chystáte se odvolat tyto podpisy:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvořit odvolací certifikáty? (a/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "neexistuje tajný klí�\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "pokus odvolat ID neuživatele: %s\n"
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "uživatelské ID „%s“ je již odvoláno\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "POZOR: podpis ID uživatele je datován %d sekund v budoucnosti\n"
 
-#: g10/keyedit.c:6426
+#: g10/keyedit.c:6320
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Poslední platné ID uživatele nelze odvolat.\n"
 
-#: g10/keyedit.c:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klí� %s je již odvolán.\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklí� %s je již odvolán.\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, 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"
@@ -5157,33 +5140,33 @@ msgstr "příliš mnoho předvoleb pro AEAD\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "neplatná položka „%s“ v řetězci s předvolbami\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "zapisuji podpis klí�e jím samým (direct signature)\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "zapisuji podpis klí�e sebou samým\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "zapisuji „key-binding“ podpis\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatná délka klí�e; použiji %u bitů\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "délka klí�e zaokrouhlena na %u bitů\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5191,19 +5174,19 @@ msgstr ""
 "POZOR: některé OpenPGP programy nedokáží zacházet s DSA klí�em s takto "
 "dlouhým hashem\n"
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr "Podepisování"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr "Certifikování"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr "Šifrování"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr "Autentizace"
 
@@ -5217,166 +5200,166 @@ msgstr "Autentizace"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "Možné způsoby užití tohoto klí�e %s: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr "Aktuálně povolené způsoby užití: "
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Přepnout schopnost podepisovat\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Přepnout schopnost šifrovat\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Přepnout schopnost autentizovat\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Konec\n"
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA a RSA%s\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA a Elgamal%s\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, c-format
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (pouze pro podpis)%s\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2113
 #, c-format
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (pouze pro podpis)%s\n"
 
-#: g10/keygen.c:2142
+#: g10/keygen.c:2119
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (pouze pro šifrování)%s\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, c-format
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (pouze pro šifrování)%s\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2127
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (nastavit si vlastní použití)%s\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (nastavit si vlastní použití)%s\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ECC (podpis a šifrování)%s\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 msgid " *default*"
 msgstr " *výchozí*"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (pouze pro podpis)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) ECC (nastavit si vlastní použití)%s\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, c-format
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC (pouze pro šifrování)%s\n"
 
-#: g10/keygen.c:2167
+#: g10/keygen.c:2144
 #, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) Existující klí�%s\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "  (%d) Klí� existující na kartě%s\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Vložte keygrip: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Klí� s takovým keygripem neexistuje\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 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:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Dostupné klí�e:\n"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "zaokrouhleno na %u bitů\n"
 
-#: g10/keygen.c:2570
+#: g10/keygen.c:2547
 #, 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:2578
+#: g10/keygen.c:2555
 #, 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:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 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:2641
+#: g10/keygen.c:2618
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Prosím, vyberte, kterou eliptickou křivku chcete:\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5392,7 +5375,7 @@ msgstr ""
 "      <n>m = doba platnosti klí�e skon�í za n měsíců\n"
 "      <n>y = doba platnosti klí�e skon�í za n let\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5408,38 +5391,38 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�í za n měsíců\n"
 "      <n>y = doba platnosti podpisu skon�í za n let\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Klí� je platný po? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platný pro? (%s) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "neplatná hodnota\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr "Platnost klí�e nikdy neskon�í\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr "Platnost podpisu nikdy neskon�í\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Platnost klí�e skon�í v %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnost podpisu skon�í v %s\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5447,11 +5430,11 @@ msgstr ""
 "Váš systém neumí zobrazit data po roce 2038.\n"
 "V každém případě budou data korektně zpracovávána do roku 2106.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr "Je to správně (a/N)? "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5466,7 +5449,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5482,41 +5465,41 @@ msgstr ""
 "    „Magda Prochazkova (student) <magda@domena.cz>“\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Jméno a příjmení: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Neplatný znak ve jméně\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, 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:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "E-mailová adresa: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Neplatná e-mailová adresa\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Komentář: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Neplatný znak v komentáři\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Používáte znakovou sadu „%s“.\n"
 
-#: g10/keygen.c:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5527,11 +5510,11 @@ msgstr ""
 "    „%s“\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Takový identifikátor uživatele již u tohoto klí�e existuje!\n"
 
@@ -5546,33 +5529,33 @@ msgstr "Takový identifikátor uživatele již u tohoto klí�e existuje!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Změnit (J)méno, (E)-mail nebo (U)kon�it? "
 
-#: g10/keygen.c:3148
+#: g10/keygen.c:3125
 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Nejdřív, prosím, opravte chybu\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5585,18 +5568,18 @@ msgstr ""
 "používat disky); díky tomu má generátor lepší šanci získat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr "POZOR: je požadována verze 4, ale je přebita verzí 5.\n"
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvoření klí�e se nepodařilo: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5607,64 +5590,64 @@ msgstr ""
 "    „%s“\n"
 "\n"
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr "Pokra�ovat (A/n) "
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Klí� pro „%s“ již existuje\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 msgid "Create anyway? (y/N) "
 msgstr "Přesto vytvořit? (a/N) "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, c-format
 msgid "creating anyway\n"
 msgstr "přesto se vytváří\n"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, 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:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Vytváření klí�e bylo zrušeno.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, 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:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "veřejný klí� se zapisuje do „%s“\n"
 
-#: g10/keygen.c:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovatelný soubor veřejných klí�ů (pubring): %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, 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:5644
+#: g10/keygen.c:5615
 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:5660
+#: g10/keygen.c:5631
 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"
@@ -5672,7 +5655,7 @@ msgstr ""
 "Tento klí� nemůže být použitý pro šifrování. K vytvoření\n"
 "sekundárního klí�e pro tento ú�el můžete použít příkaz „--edit-key“.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5680,7 +5663,7 @@ msgstr ""
 "klí� byl vytvořen %lu sekund v budoucnosti (došlo ke změně �asu nebo\n"
 "je problém se systémovým �asem)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5688,22 +5671,22 @@ msgstr ""
 "klí� byl vytvořen %lu sekund v budoucnosti (došlo ke změně �asu nebo\n"
 "je problém se systémovým �asem)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvořit? (a/N) "
 
@@ -5711,27 +5694,43 @@ msgstr "Opravdu vytvořit? (a/N) "
 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"
@@ -5739,7 +5738,7 @@ msgstr[0] "%d dobrý podpis\n"
 msgstr[1] "%d dobré podpisy\n"
 msgstr[2] "%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"
@@ -5747,7 +5746,7 @@ msgstr[0] "%d podpis neověřen, protože došlo k chybě\n"
 msgstr[1] "%d podpisy neověřeny, protože došlo k chybám\n"
 msgstr[2] "%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"
@@ -5755,33 +5754,33 @@ msgstr[0] "Pozor: %lu klí� přesko�en kvůli jeho přílišné velikosti\n"
 msgstr[1] "Pozor: %lu klí�e přesko�eny kvůli jejich přílišné velikosti\n"
 msgstr[2] "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:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Otisk primárního klí�e:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr "  Otisk primárního klí�e:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "          Otisk podklí�e:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr "          Otisk klí�e ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr "  Sériové �íslo karty ="
 
@@ -6041,7 +6040,7 @@ msgstr "dešifrování selhalo: %s\n"
 #: sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
+msgstr "operace byla přinucena selhat, protože nebyla splněna pravidla normy\n"
 
 #: g10/mainproc.c:944
 #, c-format
@@ -6159,7 +6158,7 @@ msgstr "binární formát"
 msgid "textmode"
 msgstr "textový formát"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "neznámý formát"
 
@@ -6295,29 +6294,29 @@ msgstr "Nezkomprimováno"
 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:1614
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "nejednozna�ná volba „%s“\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "neznámá volba „%s“\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "neznámý slabý hashovací algoritmus „%s“\n"
@@ -6431,7 +6430,7 @@ msgstr ""
 "vytvořen %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6445,71 +6444,71 @@ msgstr ""
 "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:207
 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:228
 #, 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:239
 #, 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:241
 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:257
 #, 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:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Je tato fotografie správná (a/N/u)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, 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:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, 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:689
 #, 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:707
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "POZOR: nelze smazat do�asný soubor (%s) „%s“: %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:711
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "POZOR: nelze smazat do�asný adresář „%s“: %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6517,7 +6516,7 @@ msgstr ""
 "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:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "nelze zobrazit photo ID!\n"
@@ -6830,12 +6829,12 @@ msgstr "neznámý implicitní adresát „%s“\n"
 msgid "no valid addressees\n"
 msgstr "žádné platné adresy\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Poznámka: klí�i %s chybí vlastnost %s\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Poznámka: klí�i %s chybí předvolby pro %s\n"
@@ -7922,7 +7921,7 @@ msgstr "použití modelu důvěry %s\n"
 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"
@@ -7952,7 +7951,7 @@ msgstr "prosím prove�te --check-trustdb\n"
 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"
@@ -7960,7 +7959,7 @@ msgstr[0] "zpracován %d klí�"
 msgstr[1] "zpracovány %d klí�e"
 msgstr[2] "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"
@@ -7968,17 +7967,17 @@ msgstr[0] " (vymazáno %d po�ítadlo platnosti)\n"
 msgstr[1] " (vymazána %d po�ítadla platnosti)\n"
 msgstr[2] " (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"
@@ -7986,7 +7985,7 @@ msgstr ""
 "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"
@@ -8110,7 +8109,7 @@ msgstr ""
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8118,7 +8117,7 @@ msgstr "%sČíslo: %s%%0ADržitel: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8148,7 +8147,7 @@ msgstr "|N|Prosím, zadejte nový kód pro odblokování (PUK)"
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "||Prosím, zadejte kód pro odblokování (PUK) vaší karty PIV"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8234,60 +8233,60 @@ msgstr[2] "generování klí�e dokon�eno (%d sekund)\n"
 msgid "response does not contain the public key data\n"
 msgstr "odpově� neobsahuje veřejný klí�\n"
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Prosím, zadejte PIN správce"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 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:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, 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:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, 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:1654
+#: scd/app-nks.c:1656
 msgid "Note: PIN has not yet been enabled."
 msgstr "Poznámka: PIN ještě nebyl zapnut."
 
-#: scd/app-nks.c:1701
+#: 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:2074
+#: 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:2082
+#: 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:2092
+#: 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:2102
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8295,7 +8294,7 @@ msgstr ""
 "|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:2104
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8303,7 +8302,7 @@ msgstr ""
 "|NP|Prosím, zadejte kód pro odblokování (PUK) klí�e ur�eného na tvorbu "
 "kvalifikovaných podpisů."
 
-#: scd/app-nks.c:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 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"
@@ -8563,26 +8562,26 @@ msgstr "obsluha pro deskriptor %d spuštěna\n"
 msgid "handler for fd %d terminated\n"
 msgstr "obsluha pro deskriptor %d ukon�ena\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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
 #, 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:199 sm/certchain.c:2211
 msgid "chain"
 msgstr "řetězený"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 msgid "shell"
 msgstr "jednovrstvý"
 
@@ -8605,234 +8604,234 @@ msgstr "politika ozna�ená jako kritická bez nastavených politik"
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "otisk se nepodařilo získat\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, 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:646
 #, 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:740
+#: sm/certchain.c:725 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:793
 #, 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:818
 #, 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:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, 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:1260 sm/certchain.c:1264
 msgid "certificate has been revoked"
 msgstr "certifikát byl odvolán"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr "status certifikáty není znám"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, 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:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, 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:1337 sm/certchain.c:1422
 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:1338 sm/certchain.c:1423
 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:1351 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr "certifikátu vypršela platnost"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 msgid "root certificate has expired"
 msgstr "kořenový certifikát je prošlý"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 msgid "intermediate certificate has expired"
 msgstr "mezilehlý certifikát je prošlý"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, 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:1404
 msgid "certificate with invalid validity"
 msgstr "certifikát s neplatnou platností"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 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:1443
 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:1444
 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:1448
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (       podpis vytvořen "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (   certifikát vytvořen "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (   certifikát planý od "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (   vydavatel platný od "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "otisk=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, 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:1505
 #, 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:1511
 #, 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:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "POZOR: datum vytvoření podpisu není známo – předpokládám sou�asnost"
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 msgid "no issuer found in certificate"
 msgstr "v certifikátu nebyl nalezen vydavatel"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 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:1785 dirmngr/validate.c:576
 #, 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:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, 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:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr "certifikát vydavatele nebyl nalezen"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, 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:1911 dirmngr/validate.c:693
 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:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr "certifikát je v pořádku\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "mezilehlý certifikát je v pořádku\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, 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:2198
 msgid "switching to chain model"
 msgstr "přepínám do řetězeného modelu"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr "použit ověřovací model: %s"
@@ -8860,7 +8859,7 @@ msgstr "(toto je algoritmus MD2)\n"
 # 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:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "žádný"
 
@@ -8894,42 +8893,42 @@ msgstr ""
 "sériové �íslo %s, ID 0x%08lX,\n"
 "vytvořen %s, platnost vyprší %s.\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, 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:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, 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:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, 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:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, 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:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, 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:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certifikát není použitelný pro šifrování\n"
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certifikát není použitelný pro podepisování\n"
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "hledá se jiný certifikát\n"
@@ -9485,7 +9484,7 @@ 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
+#: sm/sign.c:916
 #, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "%s/%s podpis vytvořen pomocí %s klí�e %s\n"
@@ -9680,7 +9679,7 @@ msgstr "odstraňuje se soubor keše „%s“\n"
 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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "chyba při zavírání souboru keše: %s\n"
@@ -9937,134 +9936,134 @@ msgstr "neznámý hašovací algoritmus „%s“\n"
 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:1849 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:1923
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse selhal: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1938
 #, 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:1945
 #, 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:1949
 #, 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:1969
 #, 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:1984
 #, 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:2011
 #, 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:2026
 #, 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:2072
 #, 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:2084
 #, 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:2226
 #, 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:2233
 #, 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:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, 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:2301
 #, 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:2308
 #, 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:2333
 #, 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:2337
 #, 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:2353
 #, 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:2363
 #, 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:2414
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "vytváří se soubor keše „%s“\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, 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:2460
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10073,66 +10072,66 @@ msgstr ""
 "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:2497
 #, 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:2520
 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:2523
 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:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr " CHYBA: CRL nebude použit\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 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:2551
 #, 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:2558
 #, 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:2569
 #, 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:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr "Konec výpisu CRL\n"
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "volání crl_fetch přes DP selhalo: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, 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:2779
+#: dirmngr/crlcache.c:2780
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "volání crl_cache_insert přes vydavatele selhalo: %s\n"
@@ -10142,12 +10141,9 @@ msgstr "volání crl_cache_insert přes vydavatele selhalo: %s\n"
 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
@@ -10368,10 +10364,8 @@ msgid "use system's HTTP proxy setting"
 msgstr "používat systémové nastavení HTTP proxy"
 
 #: dirmngr/dirmngr.c:252
-#, fuzzy
-#| msgid "Configuration for HTTP servers"
 msgid "Configuration for OpenPGP servers"
-msgstr "Nastavení HTTP serverů"
+msgstr "Nastavení pro servery OpenPGP"
 
 #: dirmngr/dirmngr.c:255
 msgid "|URL|use keyserver at URL"
@@ -10382,10 +10376,8 @@ 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:259
-#, fuzzy
-#| msgid "Configuration for HTTP servers"
 msgid "Configuration for X.509 servers"
-msgstr "Nastavení HTTP serverů"
+msgstr "Nastavení pro servery X.509"
 
 #: dirmngr/dirmngr.c:261
 msgid "inhibit the use of LDAP"
@@ -10480,12 +10472,12 @@ msgstr "použití: %s [volby] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "dvojte�ky v názvu socketu jsou nepřípustné\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "stahování CRL z „%s“ selhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "zpracování CRL z „%s“ selhalo: %s\n"
@@ -10677,10 +10669,8 @@ msgid "response from server too large; limit is %d bytes\n"
 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
@@ -10732,92 +10722,92 @@ msgstr "hašování OCSP odpovědi pro „%s“ selhalo: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "nepodepsáno výchozím OCSP certifikátem podepisovatele"
 
-#: dirmngr/ocsp.c:582
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "alokování prvku seznamu selhalo: %s\n"
 
-#: dirmngr/ocsp.c:598 dirmngr/ocsp.c:782
+#: 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:642
+#: 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:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "certifikát vydavatele nenalezen: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: 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:698
+#: 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:708
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "alokace OCSP kontextu selhala: %s\n"
 
-#: dirmngr/ocsp.c:747
+#: 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:753
+#: 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:760
+#: 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:765
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "použije se OCSP odpovída� „%s“\n"
 
-#: dirmngr/ocsp.c:822
+#: 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:847
+#: 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:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "dobrý"
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: 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:901
+#: 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:916
+#: 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"
@@ -10831,63 +10821,63 @@ msgstr "volání assuan_inquire(%s) selhalo: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "volání assuan_inquire selhalo: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, 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:1743
 #, 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:1776
 #, 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:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies (max. odpovědí) %d překro�eno\n"
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "řídící strukturu nelze alokovat: %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "alokace kontextu assuan selhala: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "inicializace serveru selhala: %s\n"
 
-#: dirmngr/server.c:3062
+#: dirmngr/server.c:3078
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "registrace příkazu u Assuanu selhala: %s\n"
 
-#: dirmngr/server.c:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "problém příjmu Assuanu: %s\n"
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "zpracování Assuanu se nezdařilo: %s\n"
@@ -11193,33 +11183,33 @@ msgstr ""
 "Syntaxe: gpg-check-pattern [volby] soubor_se_vzorem\n"
 "Prověří heslo zadané na vstupu proti souboru se vzory\n"
 
-#: tools/gpg-card.c:2421
+#: tools/gpg-card.c:2425
 #, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Poznámka: na kartě je již klí� %s uložen!\n"
 
-#: tools/gpg-card.c:2424
+#: 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"
 
-#: tools/gpg-card.c:2427
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Přepsat existující klí�e %s? (a/N) "
 
-#: tools/gpg-card.c:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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 karta %s �íslo %s\n"
 
-#: tools/gpg-card.c:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr "Příznak interakce uživatele (UIF) je nastaven na „%s“ – nelze změnit\n"
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -11228,47 +11218,56 @@ 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr "Prosím, použijte „uif --yes %d %s“\n"
 
-#: tools/gpg-card.c:3700
+#: tools/gpg-card.c:3758
 msgid "authenticate to the card"
 msgstr "autentizuje se kartÄ›"
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr "odešle reset démonu pro karty"
 
-#: tools/gpg-card.c:3704
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "nastaví KDF pro autentizaci kódem PIN"
 
-#: tools/gpg-card.c:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr "změní soukromý datový objekt"
 
-#: tools/gpg-card.c:3707
+#: tools/gpg-card.c:3765
 msgid "read a certificate from a data object"
 msgstr "pře�te certifikát z datového objektu"
 
-#: tools/gpg-card.c:3708
+#: tools/gpg-card.c:3766
 msgid "store a certificate to a data object"
 msgstr "uloží certifikát do datového objektu"
 
-#: tools/gpg-card.c:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr "uloží soukromý klí� do datového objektu"
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr "Příkazy pro správu Yubikey"
 
-#: tools/gpg-card.c:3712
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 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 "error writing to temporary file: %s\n"
 #~ msgstr "chyba při zápisu do do�asného souboru: %s\n"
 
diff --git a/po/da.gmo b/po/da.gmo
index 12ec51e..ffbb3bf 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 4bf6a9f..b241bf1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2017-11-02 17:39+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -171,8 +171,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "Adgangsfrase:"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "matcher ikke - prøv igen"
 
@@ -221,17 +221,17 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "fejl ved indhentelse af serielnummer for kort: %s\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Genindtast venligst denne adgangsfrase"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -243,7 +243,7 @@ msgstr ""
 "Indtast venligst adgangsfrasen for at beskytte det importeret objekt inden i "
 "GnuPG-systemet."
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -254,26 +254,26 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -284,13 +284,13 @@ msgstr "kan ikke åbne »%s«: %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "ingen egnet kortnøgle fundet: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, 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:2777
+#: agent/command-ssh.c:2782
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -299,20 +299,20 @@ msgstr ""
 "En ssh-proces anmodte om brugen af nøgle%%0A  %s%%0A  (%s)%%0AØnsker du at "
 "tillade dette"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Tillad"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Nægt"
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -321,7 +321,7 @@ msgstr ""
 "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:3797
+#: agent/command-ssh.c:3837
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
@@ -471,225 +471,231 @@ msgstr "Indtast venligst adgangsfrasen %0Afor at beskytte din nye nøgle"
 msgid "Please enter the new passphrase"
 msgstr "Indtast venligst den nye adgangsfrase"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Tilvalg nyttige for fejlsøgning"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr "kør i dæmontilstand (baggrunden)"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr "kør i servertilstand (forgrunden)"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "frakobl ikke fra konsollen"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr "kommandoresultat i sh-stil"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr "kommandoresultat i csh-stil"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|læs tilvalg fra FIL"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr "Tilvalg der kontrollerer det diagnostiske resultat"
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "uddybende"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "vær mindre uddybende"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|skriv servertilstandslogge til FIL"
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr "Tilvalg der kontrollerer konfigurationen"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 msgid "do not use the SCdaemon"
 msgstr "brug ikke SCdaemon'en"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|brug PGM som SCdaemon-program"
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 #, 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:215
+#: agent/gpg-agent.c:216
 #, 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:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr "ignorer forespørgsler om at ændre TTY'en"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr "ignorer forespørgsler om at ændre X-skærmen"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "aktiver ssh-agent-emulering"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 msgid "enable putty support"
 msgstr ""
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "enable ssh-agent emulation"
+msgid "enable Win32-OpenSSH support"
+msgstr "aktiver ssh-agent-emulering"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "Tilvalg der kontrollerer sikkerheden"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|udløb mellemlagrede PIN'er efter N sekunder"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|udløb SSH-nøgler efter N sekunder"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 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:248
+#: agent/gpg-agent.c:256
 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:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr "brug ikke PIN-mellemlageret når der underskrives"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 #, 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:254
+#: agent/gpg-agent.c:262
 #, 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:259
+#: agent/gpg-agent.c:267
 msgid "allow presetting passphrase"
 msgstr "tillad forhåndsindstilling af adgangsfrase"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr "Tilvalg der fremtvinger en adgangsfrasepolitik"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr "tillad ikke omgåelse af adgangsfrasepolitikken"
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 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:271
+#: agent/gpg-agent.c:279
 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:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|kontroller nye adgangsfraser mod mønstre i FIL"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|giv adgangsfrasen udløb efter N dage"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 msgid "do not allow the reuse of old passphrases"
 msgstr "tillad ikke genbrug af gamle adgangsfraser"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Tilvalg der kontrollerer sikkerheden"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 #, 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:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|brug PGM som PIN-Entry-program"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 #, 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:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: 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:570
+#: agent/gpg-agent.c:582
 #, 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:572
+#: agent/gpg-agent.c:584
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -701,147 +707,147 @@ msgstr ""
 "Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
 "Hemmelig nøglehåndtering for GnuPG\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, 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:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgt sammendragsalgoritme er ugyldig\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, 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:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: »%s« er en forældet indstilling\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke oprette sokkel: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, 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:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "fejl ved indhentelse af nonce for soklen\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, 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:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, 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:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, 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:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, 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:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: 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:2402
+#: agent/gpg-agent.c:2423
 #, 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:2406
+#: agent/gpg-agent.c:2427
 #, 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:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, 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:2768
+#: agent/gpg-agent.c:2882
 #, 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:2773
+#: agent/gpg-agent.c:2887
 #, 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:2848
+#: agent/gpg-agent.c:2962
 #, 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:2853
+#: agent/gpg-agent.c:2967
 #, 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:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, 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:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppet\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1125,7 +1131,7 @@ msgstr "kontrol af oprettet underskrift mislykkedes: %s\n"
 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:1602
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1143,13 +1149,13 @@ msgstr "beskyttelsesalgoritme %d%s er ikke understøttet\n"
 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
@@ -1157,43 +1163,43 @@ msgstr "fejl ved oprettelse af datakanal: %s\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1224,20 +1230,20 @@ msgstr "Advarsel: usikker ejerskab på %s »%s«\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Advarsel: usikre rettigheder på %s »%s«\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, fuzzy, c-format
 #| msgid "waiting %d seconds for the agent to come up\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "venter %d sekunder på at agenten kommer frem\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "ja"
 
@@ -1291,8 +1297,8 @@ msgstr "ikke nok kerne i sikker hukommelse under allokering af %lu byte"
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1313,77 +1319,77 @@ msgstr "ADVARSEL: »%s« er en forældet indstilling - den har ingen effekt\n"
 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:432 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"
@@ -1532,11 +1538,11 @@ msgstr "Certifikatkæde er gyldig"
 msgid "Root certificate trustworthy"
 msgstr "Rodcertifikat er troværdigt"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 msgid "no CRL found for certificate"
 msgstr "ingen CRL fundet for certifikat"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 msgid "the available CRL is too old"
 msgstr "den tilgængelige CRL er for gammel"
 
@@ -1574,7 +1580,7 @@ msgstr "Ingen hjælp tilgængelig for »%s«."
 msgid "ignoring garbage line"
 msgstr "ignorerer affaldslinje"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "[none]"
 msgstr "[ingen]"
 
@@ -1620,39 +1626,39 @@ msgstr "iconv_open mislykkedes: %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
 #, 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"
@@ -1662,105 +1668,105 @@ msgstr "venter på lås %s ...\n"
 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
+#: 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:1462
+#: g10/build-packet.c:1480
 #, 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:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1769,28 +1775,28 @@ msgstr ""
 "et notationsnavn må kun have udskrivningstegn eller mellemrum og skal "
 "sluttes med et »=«\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "et brugernotationsnavn skal indeholde tegnet »@«\n"
 
-#: g10/build-packet.c:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1800,7 +1806,7 @@ msgstr ""
 "et notationsnavn må kun have udskrivningstegn eller mellemrum og skal "
 "sluttes med et »=«\n"
 
-#: g10/build-packet.c:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "ADVARSEL: Ingen notationsdata fundet\n"
@@ -1816,7 +1822,7 @@ msgstr "kunne ikke proxy %s-forespørgsel til klient\n"
 msgid "Enter passphrase: "
 msgstr "Indtast adgangsfrase\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 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"
@@ -1835,7 +1841,7 @@ msgstr "fejl ved læsning fra %s: %s\n"
 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:2330
+#: 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"
@@ -1881,172 +1887,172 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "opret et tilbagekaldscertifikat"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "tvunget"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 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:1500
+#: g10/card-util.c:803 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:1502
+#: g10/card-util.c:805 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:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Kortholders efternavn: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Kortholders fornavn: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Loginddata (kontonavn): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Private DO-data: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Sprogpræferencer: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Fejl: ugyldigt svar.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "CA-fingeraftryk: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 msgid "not an OpenPGP card"
 msgstr "ikke et OpenPGP-kort"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr "Erstat eksisterende nøgle? (j/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 tools/gpg-card.c:3363
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -2063,112 +2069,112 @@ msgstr ""
 "        dokumentationen for dit kort for at se hvilke størrelser, der\n"
 "        er tilladt.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) Underskriftsnøgle\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Krypteringsnøgle\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Godkendelsesnøgle\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 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:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, fuzzy, c-format
 #| msgid ""
 #| "Please note that the factory settings of the PINs are\n"
@@ -2183,189 +2189,189 @@ msgstr ""
 "   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:1741
 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:1743 g10/card-util.c:1833
 msgid "   (1) Signature key\n"
 msgstr "   (1) Underskriftsnøgle\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1744 g10/card-util.c:1835
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnøgle\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Godkendelsesnøgle\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 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:1876
 #, 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:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr "vis administratorkommandoer"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "vis denne hjælpetekst"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 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:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "ændr kortholders navn"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 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:3689
+#: g10/card-util.c:2262 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:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "ændr logindnavnet"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "ændr sprogpræferencerne"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 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:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "ændr et CA-fingeraftryk"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 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:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "opret nye nøgler"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 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:3698
+#: g10/card-util.c:2271 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:3699
+#: g10/card-util.c:2272 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:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr ""
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2276
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "ændr ejertroværdigheden"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 msgid "Admin-only command\n"
 msgstr "Kommandoer kun for administratoren\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr "Administratorkommandoer er tilladt\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommando\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2427,9 +2433,9 @@ msgstr ""
 msgid "subkey"
 msgstr "Pubkey: "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "opdatering mislykkedes: %s\n"
@@ -2462,19 +2468,19 @@ msgstr ""
 "ADVARSEL: Tvang for symmetrisk chiffer %s (%d) overtræder modtagerens "
 "præferencer\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, 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"
@@ -2486,48 +2492,49 @@ msgstr "du må ikke bruge chifferalgoritmen »%s« i tilstanden %s\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:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fejl ved oprettelse af adgangsfrase: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "bruger chiffer %s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "»%s« allerede komprimeret\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, 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:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 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 "du må ikke bruge sammendragsalgoritmen »%s« i tilstanden %s\n"
 
-#: g10/encrypt.c:862
+#: g10/encrypt.c:853
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "læser fra »%s«\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2536,13 +2543,13 @@ msgstr ""
 "ADVARSEL: Tvang for komprimeringsalgoritme %s (%d) overtræder modtagerens "
 "præferencer\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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"
@@ -2572,64 +2579,76 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2699,7 +2718,7 @@ msgstr "Ugyldig nøgle %s gjort gyldig med --allow-non-selfsigned-uid\n"
 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:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
@@ -2781,117 +2800,117 @@ msgstr "opret et nyt nøglepar"
 msgid "quickly set a new expiration date"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "opret et tilbagekaldscertifikat"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "fjern nøgler fra den offentlige nøglering"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "fjern nøgler fra den hemmelige nøglering"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "underskriv en nøgle"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "underskriv en nøgle lokalt"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "underskriv en nøgle"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "underskriv en nøgle lokalt"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "underskriv eller rediger en nøgle"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "ændr en adgangsfrase"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "eksporter nøgler"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "eksporter nøgler til en nøgletjener"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "importer nøgler fra en nøgleserver"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "søg efter nøgler på en nøgleserver"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "opdater alle nøgler fra en nøgleserver"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "importer/sammenføj nøgler"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr "udskriv kortstatus"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr "ændr data på et kort"
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr "ændr et korts PIN"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "opdater troværdighedsdatabasen"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 msgid "print message digests"
 msgstr "vis beskedsammendrag"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "kør i servertilstand"
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|krypter også til bruger-id-NAVN"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|opsæt e-post-aliasser"
 
@@ -2907,61 +2926,61 @@ msgstr "lav ingen ændringer"
 msgid "prompt before overwriting"
 msgstr "spørg før overskrivning"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Tilvalg der kontrollerer sikkerheden"
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Tilvalg der kontrollerer det diagnostiske resultat"
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "opret ascii-pansrede uddata"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|skriv resultat til FIL"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "brug kanonisk teksttilstand"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|sæt komprimeringsniveauet til N (0 deaktiverer)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 #, 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:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|brug MEKANISMER til at finde nøgler efter postadresser"
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 #, 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:781
+#: g10/gpg.c:780
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "vis og kontroller nøgleunderskrifter"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "deaktiver al adgang til dirmngr"
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2989,7 +3008,7 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2997,7 +3016,7 @@ msgstr ""
 "@\n"
 "(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -3027,14 +3046,14 @@ msgstr ""
 " --list-keys [navne]        vis nøgler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 #, 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:1175
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -3049,7 +3068,7 @@ msgstr ""
 "Sign, check, encrypt eller decrypt\n"
 "standardhandling afhænger af inddata\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -3057,82 +3076,82 @@ msgstr ""
 "\n"
 "Understøttede algoritmer:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] %s\n"
 msgstr "brug: gpgsm [tilvalg] "
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "kommandoer er i konflikt\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, 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:1708
+#: g10/gpg.c:1698
 #, 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:1711
+#: g10/gpg.c:1701
 #, 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:1714
+#: g10/gpg.c:1704
 #, 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:1720
+#: g10/gpg.c:1710
 #, 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:1723
+#: g10/gpg.c:1713
 #, 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:1726
+#: g10/gpg.c:1716
 #, 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:1732
+#: g10/gpg.c:1722
 #, 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:1735
+#: g10/gpg.c:1725
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3141,19 +3160,19 @@ msgid ""
 msgstr ""
 "ADVARSEL: Usikkert indelukket mappeejerskab på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1738
+#: g10/gpg.c:1728
 #, 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:1744
+#: g10/gpg.c:1734
 #, 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:1747
+#: g10/gpg.c:1737
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3163,492 +3182,480 @@ msgid ""
 msgstr ""
 "ADVARSEL: Usikre indelukkede mapperettigheder på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1750
+#: g10/gpg.c:1740
 #, 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:1966
+#: g10/gpg.c:1956
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "ukendt konfigurationspunkt »%s«\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr "vis billed-id'er under nøglevisninger"
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 #, 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:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr "vil politikadresser under underskriftvisninger"
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 msgid "show all notations during signature listings"
 msgstr "vis alle notationer under underskriftvisninger"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr "vis IETF-standardnotationer under underskriftvisninger"
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr "vis brugerangivne notationer under underskriftvisninger"
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "vis foretrukne nøgleserveradresser under underskriftvisninger"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr "vis bruger-id-validitet under nøglevisninger"
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 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:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr "vis tilbagekaldte og udløbne undernøgler i nøglevisninger"
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 msgid "show the keyring name in key listings"
 msgstr "vis nøgleringsnavnet i nøglevisninger"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 msgid "show expiration dates during signature listings"
 msgstr "vis udløbsdatoer under underskriftvisninger"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "vis præferencer (ekspert)"
+
+#: g10/gpg.c:2197
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "ukendt tilvalg »%s«\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, 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:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, 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:3220
+#: g10/gpg.c:3194
 #, 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:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, 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:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, 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:3315
+#: g10/gpg.c:3286
 #, 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:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke fortolke nøgleserveradresse\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige indstillinger for nøgleserver\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "ugyldige indstillinger for nøgleserver\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importindstillinger\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "ugyldige importindstillinger\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportindstillinger\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "ugyldige eksportindstillinger\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr "ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr "vis billed-id'er under underskriftverificering"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr "vis politikadresser under underskriftverificering"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 msgid "show all notations during signature verification"
 msgstr "vis alle notationer under underskriftverificering"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr "vis IETF-standardnotationer under underskriftverificering"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr "vis brugerangivne notationer under underskriftverificering"
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "vis foretrukne nøgleserveradresser under underskriftverificering"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 msgid "show user ID validity during signature verification"
 msgstr "vis bruger-id-validitet under underskriftverificering"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "vis tilbagekaldte og udløbne bruger-id'er i underskriftverificering"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 msgid "show only the primary user ID in signature verification"
 msgstr "vis kun den primære bruger-id i underskriftverificering"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige verificeringsindstillinger\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr "ugyldige verificeringsindstillinger\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke angive kørselssti til %s\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig liste for auto-key-locate\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ugyldig liste for auto-key-locate\n"
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, 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:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: program kan oprette en kernefil!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overskriver %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsløs sammen med %s!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "ADVARSEL: kører med forfalsket systemtid: "
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, 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:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt chifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3952
-#, 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:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt komprimeringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt algoritme for certifikationssammendrag er ugyldig\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, 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:3987
+#: g10/gpg.c:3950
 #, 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:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ugyldige standardpræferencer\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldige præferencer for personlig chiffer\n"
 
-#: g10/gpg.c:4015
-#, 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:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldige præferencer for personlig sammendrag\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldige præferencer for personlig komprimering\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, 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:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker endnu ikke med %s\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TrustDB: %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, 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:4417
+#: g10/gpg.c:4365
 #, 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:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, 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:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nøgleserver send mislykkedes: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nøgleserver modtag mislykkedes: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nøgleeksport mislykkedes: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, 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:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nøgleserver søg mislykkedes: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "nøgleserver opdater mislykkedes: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af panser mislykkedes: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "påklædning af panser mislykkedes: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "ugyldig hash-algoritme »%s«\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "GÃ¥ til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivne adresse for certifikatpolitik er ugyldig\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivne adresse for underskriftpolitik er ugyldig\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivne adresse for foretrukken nøgleserver er ugyldig\n"
@@ -3661,7 +3668,7 @@ msgstr "|FILE|tag nøglerne fra nøgleringsFILEN"
 msgid "make timestamp conflicts only a warning"
 msgstr "giv kun tidsstempelkonflikter en advarsel"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation til denne FD"
 
@@ -3691,164 +3698,164 @@ msgstr "Ingen hjælp tilgængelig"
 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"
@@ -3857,177 +3864,177 @@ msgstr ""
 "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:1998 g10/import.c:3146
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "nøgle %s: ingen bruger-id\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, 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:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, 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:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, 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:2793
 #, 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:2801
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "key %s: error sending to agent: %s\n"
@@ -4041,204 +4048,204 @@ msgstr "fejl under afsendelse af %s-kommando: %s\n"
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, 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:3138 g10/import.c:3177
 #, 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:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "Ã¥rsag for tilbagekald: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "tilbagekaldskommentar: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nøgle %s: ugyldig undernøglebinding\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3788
 #, 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:3812
 #, 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:3825
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nøgle %s: ugyldig undernøgletilbagekald\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3840
 #, 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:3887
 #, 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:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nøgle %s: udeladt undernøgle\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nøgle %s: direkte nøgleunderskrift tilføjet\n"
@@ -4282,7 +4289,7 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "Bruger-id »%s«: %d underskrift fjernet\n"
 msgstr[1] "Bruger-id »%s«: %d underskrift fjernet\n"
 
-#: g10/key-check.c:726 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"
@@ -4290,7 +4297,7 @@ msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr[0] "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
 msgstr[1] "1 underskrift er ikke kontrolleret på grund af en manglende nøgle\n"
 
-#: g10/key-check.c:734 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"
@@ -4348,15 +4355,15 @@ msgstr "nøgleblokressource »%s«: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "kunne ikke genbygge nøgleringsmellemlager: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[revocation]"
 msgstr "[tilbagekald]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[egenunderskrift]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4367,17 +4374,17 @@ msgstr ""
 "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:389 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:390 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:408
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4387,52 +4394,52 @@ msgstr ""
 "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:425
 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:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  Kunne ikke underskrive.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Bruger-id »%s« er udløbet."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Bruger-id »%s« er ikke egenunderskrevet."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Bruger-id »%s« kan underskrives.  "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr "Underskriv? (j/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4441,11 +4448,11 @@ msgstr ""
 "Egenunderskriften på »%s«\n"
 "er en underskrift i PGP 2.x-stil.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4454,12 +4461,12 @@ msgstr ""
 "Din aktuelle underskrift på »%s«\n"
 "er udløbet.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4468,45 +4475,45 @@ msgstr ""
 "Din aktuelle underskrift på »%s«\n"
 "er en lokal underskrift.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "Denne nøgle er udløbet!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4517,33 +4524,33 @@ msgstr ""
 "faktisk tilhører personen navngivet ovenfor? Hvis du ikke kender svaret, så "
 "indtast »0«.\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, 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:876
 #, 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:878
 #, 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:881
 #, 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:888
 #, 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:915
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4552,243 +4559,243 @@ msgstr ""
 "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:923
 msgid "This will be a self-signature.\n"
 msgstr "Dette vil være en egenunderskrift.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 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:935
 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:945
 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:952
 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:959
 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:964
 msgid "I have checked this key casually.\n"
 msgstr "Jeg har overfladisk kontrolleret denne nøgle.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 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:981
 msgid "Really sign? (y/N) "
 msgstr "Underskriv? (j/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "underskrift mislykkedes: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 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:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 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:1270
 #, fuzzy
 #| msgid "Enter the keygrip: "
 msgid "show the keygrip"
 msgstr "Indtst nøglegrebet: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "vis nøgle og bruger-id'er"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "vælg bruger-id N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr "vælg undernøgle N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr "kontroller underskrifter"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 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:1286
 msgid "sign selected user IDs locally"
 msgstr "underskriv valgte bruger-id'er lokalt"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 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:1289
 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:1291
 msgid "add a user ID"
 msgstr "tilføj bruger-id"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "tilføj billed-id"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr "slet valgte bruger-id'er"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr "tilføj en undernøgle"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr "tilføj en nøgle til et smartkort"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr "flyt en nøgle til et smartkort"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr "flyt en sikkerhedskopinøgle til et smartkort"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 msgid "delete selected subkeys"
 msgstr "slet valgte undernøgler"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "tilføj en tilbagekaldsnøgle"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 msgid "delete signatures from the selected user IDs"
 msgstr "slet underskrifter fra de valgte bruger-id'er"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1314
 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:1316
 msgid "flag the selected user ID as primary"
 msgstr "marker den valgte bruger-id som primær"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "vis præferencer (ekspert)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "vis præferencer (uddybende)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 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:1325
 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:1327
 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:1329
 msgid "change the passphrase"
 msgstr "ændr adgangsfrasen"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "ændr ejertroværdigheden"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 msgid "revoke signatures on the selected user IDs"
 msgstr "tilbagekald underskrifter på de valgte bruger-id'er"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 msgid "revoke selected user IDs"
 msgstr "tilbagekald valgte bruger-id'er"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "revoke key or selected subkeys"
 msgstr "tilbagekald nøgle eller valgte undernøgler"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "enable key"
 msgstr "aktiver nøgle"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr "deaktiver nøgle"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr "vis valgte billed-id'er"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 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:1349
 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:1470
 msgid "Secret key is available.\n"
 msgstr "Hemmelig nøgle er tilgængelig.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 #, 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:1574
 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:1597
 #, fuzzy
 #| msgid ""
 #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@ -4809,304 +4816,288 @@ msgstr ""
 "tnrsign\n"
 "  etc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "Nøglen er tilbagekaldt."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 #, 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:1682
 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:1690
 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:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 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:1756
 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:1814 g10/keyedit.c:1854
 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 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:1894
 msgid "Command expects a filename argument\n"
 msgstr "Kommando forventer en filnavnsparameter\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, 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:1934
 #, 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:1969
 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:1975
 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:1977
 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:2015
 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:2016
 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:2034
 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:2045
 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:2047
 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:2105
 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:2150
 msgid "Set preference list to:\n"
 msgstr "Angiv præferenceliste til:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 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:2159
 msgid "Really update the preferences? (y/N) "
 msgstr "Opdater præferencerne? (j/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Save changes? (y/N) "
 msgstr "Gem ændringer? (j/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? (j/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, 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:2557
+#: g10/keyedit.c:2558
 #, 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:2583
+#: g10/keyedit.c:2584
 #, 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:2646
+#: g10/keyedit.c:2647
 #, 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:2677
+#: g10/keyedit.c:2717
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "ugyldig fingeraftryk"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, 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:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "ugyldig værdi\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Ingen sådan bruger-id.\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, 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:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Ikke underskrevet af dig.\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, 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:3211
+#: g10/keyedit.c:3251
 #, 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:3253
+#: g10/keyedit.c:3293
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "ugyldig fingeraftryk"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, 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:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Sammendrag: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Funktioner: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr "Nøgleserver no-modify"
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Fortrukken nøgleserver: "
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "oprettet: %s"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr "tilbagekaldt: %s"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr "udløbet: %s"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "udløber: %s"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr "brug: %s"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr "kortnr.: "
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr "troværdighed: %s"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr "validitet: %s"
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Denne nøgle er blevet deaktiveret"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5114,17 +5105,17 @@ msgstr ""
 "Bemærk venligst at den viste nøglevaliditet ikke nødvendigvis er\n"
 "korrekt med mindre du genstarter programmet.\n"
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "udløbet"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5133,18 +5124,18 @@ msgstr ""
 "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:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5154,37 +5145,37 @@ msgstr ""
 "medføre at\n"
 "          nogle version af PGP afviser denne nøgle.\n"
 
-#: g10/keyedit.c:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 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:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 #, 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:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slet denne gode underskrift? (j/N/a)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Slet denne ugyldige underskrift? (j/N/a)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Slet denne ukendte underskrift? (j/n/a)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Virkelig slette denne egenunderskrift? (j/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5192,20 +5183,20 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Slettede %d underskrift.\n"
 msgstr[1] "Slettede %d underskrift.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Intet slettet.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Bruger-id »%s« komprimeret: %s\n"
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
@@ -5213,17 +5204,17 @@ msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Bruger-id »%s«: %d underskrift fjernet\n"
 msgstr[1] "Bruger-id »%s«: %d underskrift fjernet\n"
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Bruger-id »%s«: allerede minimeret\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Bruger-id »%s«: allerede ryddet\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5233,44 +5224,44 @@ msgstr ""
 "tilbagekalder\n"
 "          kan medføre at nogle versioner af PGP afviser denne nøgle.\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast bruger'id for den dedikerede tilbagekalder: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 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:4719
+#: g10/keyedit.c:4611
 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:4788
+#: g10/keyedit.c:4680
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5281,179 +5272,179 @@ msgstr ""
 "Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
 "tilbagekalder? (j/N) "
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ændrer udløbstidspunkt for en undernøgle.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ændrer udløbstidspunkt for den primære nøgle.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 #, 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:4915
+#: g10/keyedit.c:4807
 #, 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:5033
+#: g10/keyedit.c:4925
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "underskriftsundernøgle %s er allerede krydscertificeret\n"
 
-#: g10/keyedit.c:5039
+#: g10/keyedit.c:4931
 #, 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:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Vælg venligst præcis en bruger-id.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "udelader v3 egenunderskrift på bruger-id »%s«\n"
 
-#: g10/keyedit.c:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr "Indtast din foretrukne nøglerserveradresse: "
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 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:5451
+#: g10/keyedit.c:5345
 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:5516
+#: g10/keyedit.c:5410
 msgid "Enter the notation: "
 msgstr "Indtast notationen: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 msgid "Proceed? (y/N) "
 msgstr "Fortsæt? (j/N) "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med hash %s\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, 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:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernøgle med indeks %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: »%s«\n"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (kan ikke eksporteres)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne underskrift udløb den %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 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:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Opret et tilbagekaldscertifikat for denne underskrift? (j/N) "
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr " (kan ikke tilbagekaldes)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "tilbagekaldt af din nøgle %s på %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du er i gang med at tilbagekalde disse underskrifter:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opret tilbagekaldscertifikaterne? (j/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "ingen hemmelig nøgle\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "bruger-id »%s« er allerede tilbagekaldt\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, 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:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nøgle %s er allerede tilbagekaldt.\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernøgle %s er allerede tilbagekaldt.\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, 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"
@@ -5497,33 +5488,33 @@ msgstr "for mange chifferpræferencer\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "ugyldigt punkt »%s« i præferencestreng\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "skriver direkte underskrift\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "skriver egenunderskrift\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "skriver underskrift for nøglebinding\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "nøglestørrelse er ugyldig; bruger %u bit\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nøglestørrelse afrundet op til %u bit\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5531,19 +5522,19 @@ msgstr ""
 "ADVARSEL: Nogle OpenPGP-programmer kan ikke håndtere en DS-nøgle med denne\n"
 "sammendragsstørrelse\n"
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr "Underskriv"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr "Certificer"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr "Krypter"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr "Godkend"
 
@@ -5557,123 +5548,123 @@ msgstr "Godkend"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr "UuKkGfAa"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, 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:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr "Aktuelt tilladte handlinger: "
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Skift evnen til at underskrive\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Skift evnen til at kryptere\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Skift evnen til at godkende\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Afsluttet\n"
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, 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:2131
+#: g10/keygen.c:2108
 #, 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:2134
+#: g10/keygen.c:2111
 #, 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:2136
+#: g10/keygen.c:2113
 #, 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:2142
+#: g10/keygen.c:2119
 #, 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:2144
+#: g10/keygen.c:2121
 #, 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:2150
+#: g10/keygen.c:2127
 #, 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:2152
+#: g10/keygen.c:2129
 #, 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:2158
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid "   (%d) sign, encrypt\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) underskriv, krypter\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (kun underskriv)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, 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:2163
+#: g10/keygen.c:2140
 #, 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:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) Eksisterende nøgle\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card%s\n"
@@ -5682,62 +5673,62 @@ msgstr "   (%d) Eksisterende nøgle fra kort\n"
 # 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:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Indtst nøglegrebet: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Ingen nøgle med dette nøglegreb\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Serielnummer for kortet: %s\n"
 
-#: g10/keygen.c:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Tilgængelige nøgler:\n"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, 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:2570
+#: g10/keygen.c:2547
 #, 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:2578
+#: g10/keygen.c:2555
 #, 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:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 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:2641
+#: g10/keygen.c:2618
 #, 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:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5753,7 +5744,7 @@ msgstr ""
 "      <n>m = nøgle udløber om n måneder\n"
 "      <n>y = nøgle udløber om n år\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5769,38 +5760,38 @@ msgstr ""
 "      <n>m = underskriften udløber om n måneder\n"
 "      <n>y = underskriften udløber om n år\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Nøgle er gyldig for? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Underskrift er gyldig for? (%s) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "ugyldig værdi\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr "Nøglen udløber aldrig\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr "Underskriften udløber aldrig\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nøglen udløber den %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Underskriften udløber den %s\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5808,11 +5799,11 @@ msgstr ""
 "Dit system kan ikke vise datoer efter 2038.\n"
 "Det vil dog blive korrekt håndteret op til 2106.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt? (j/N) "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5826,7 +5817,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5842,42 +5833,42 @@ msgstr ""
 "    »Heinrich Heine (digteren) <heinrichh@duesseldorf.de>«\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Fødselsnavn: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "E-post-adresse: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig e-post-adresse\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, 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:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5888,11 +5879,11 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Sådant et bruger-id findes allerede på denne nøgle!\n"
 
@@ -5907,35 +5898,35 @@ msgstr "Sådant et bruger-id findes allerede på denne nøgle!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 #, 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:3148
+#: g10/keygen.c:3125
 #, 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Ret venligst fejlen først\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5947,18 +5938,18 @@ msgstr ""
 "under oprettelse af primtallet; dette giver det vilkårlig\n"
 "taloprettelsesprogram en bedre mulighed for at opnå nok entropi.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nøgleoprettelse mislykkedes: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5966,72 +5957,72 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, 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:4645
+#: g10/keygen.c:4616
 #, fuzzy
 #| msgid "Use this key anyway? (y/N) "
 msgid "Create anyway? (y/N) "
 msgstr "Brug denne nøgle alligevel? (j/N) "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, fuzzy, c-format
 #| msgid "generating new key\n"
 msgid "creating anyway\n"
 msgstr "opretter ny nøgle\n"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Nøgleoprettelse annulleret.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, 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:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, 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:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbar offentlig nøglering fundet: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, 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:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig nøgle oprettet og underskrevet.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 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"
@@ -6039,7 +6030,7 @@ msgstr ""
 "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:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -6047,7 +6038,7 @@ msgstr ""
 "nøgle er blevet oprettet %lu sekund i fremtiden (tidsforskydning eller "
 "urproblem)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -6055,24 +6046,24 @@ msgstr ""
 "nøgle er blevet oprettet %lu sekunder i fremtiden (tidsforskydning eller "
 "urproblem)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette? (j/N) "
 
@@ -6080,27 +6071,43 @@ msgstr "Vil du virkelig oprette? (j/N) "
 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"
@@ -6108,7 +6115,7 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d ugyldige underskrifter\n"
 msgstr[1] "%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"
@@ -6116,40 +6123,40 @@ msgid_plural "%d signatures not checked due to errors\n"
 msgstr[0] "1 underskrift er ikke kontrolleret på grund af en fejl\n"
 msgstr[1] "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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Nøglering"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Primær nøglefingeraftryk:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr "Primær nøglefingeraftryk:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "  Undernøglefingeraftryk:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr "    Nøglefingeraftryk ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr "   Serielnr. for kort ="
 
@@ -6530,7 +6537,7 @@ msgstr "binær"
 msgid "textmode"
 msgstr "tekstilstand"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "ukendt"
 
@@ -6675,30 +6682,30 @@ msgstr "Ukomprimeret"
 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:1614
 #, 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:1639
 #, 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:1877
 #, 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:1899
 #, fuzzy, c-format
 #| msgid "Unknown signature type `%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6830,7 +6837,7 @@ msgid ""
 "%s"
 msgstr "%u-bit %s nøgle, id %s, oprettet %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6844,75 +6851,75 @@ msgstr ""
 "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:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Indtast JPEG-filnavn for billed-id: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, 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:239
 #, 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:241
 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:257
 #, 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:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Er dette billede korrekt (j/N/a)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, 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:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "unaturlig afslutning på eksternt program\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6920,7 +6927,7 @@ msgstr ""
 "kald fra eksterne programmer er deaktiveret på grund af usikre rettigheder "
 "for indstillingsfil\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "kan ikke vise billed-id!\n"
@@ -7260,12 +7267,12 @@ msgstr "ukendt standardmodtager »%s«\n"
 msgid "no valid addressees\n"
 msgstr "ingen gyldige adresser\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, 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:1768
+#: g10/pkclist.c:1766
 #, 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"
@@ -8344,7 +8351,7 @@ msgstr "bruger %s troværdighedsmodel\n"
 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"
@@ -8377,7 +8384,7 @@ msgstr "udfør venligst en --check-trustdb\n"
 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"
@@ -8385,7 +8392,7 @@ msgid_plural "%d keys processed"
 msgstr[0] "     %lu-nøgler behandlet\n"
 msgstr[1] "     %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"
@@ -8393,17 +8400,17 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d nøgler behandlet (%d validiteter ryddet)\n"
 msgstr[1] "%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"
@@ -8411,7 +8418,7 @@ msgstr ""
 "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"
@@ -8540,7 +8547,7 @@ msgstr ""
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8548,7 +8555,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8590,7 +8597,7 @@ msgstr "|A|Indtast venligst administrator-PIN'en"
 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:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8679,7 +8686,7 @@ msgstr[1] "nøgleoprettelse færdig (%d sekunder)\n"
 msgid "response does not contain the public key data\n"
 msgstr "svar indeholder ikke data for offentlig nøgle\n"
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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 "
@@ -8687,55 +8694,55 @@ 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Indtast venligst administrator-PIN'en"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 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:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, 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:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, 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:1654
+#: 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:1701
+#: 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:2074
+#: 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:2082
+#: 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:2092
+#: 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:2102
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8743,7 +8750,7 @@ msgstr ""
 "|NP|Indtast venligst en ny PIN Unblocking Code (PUK) for nøglen til at "
 "oprette kvalificerede underskrifter."
 
-#: scd/app-nks.c:2104
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8751,7 +8758,7 @@ msgstr ""
 "|P|Indtast venligst PIN Unblocking Code (PUK) for nøglen til at oprette "
 "kvalificerede underskrifter."
 
-#: scd/app-nks.c:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fejl ved indhentelse af ny PIN: %s\n"
@@ -9022,13 +9029,13 @@ msgstr "håndtering for fd %d startet\n"
 msgid "handler for fd %d terminated\n"
 msgstr "håndtering for fd %d termineret\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -9037,11 +9044,11 @@ msgstr ""
 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:199 sm/certchain.c:2211
 msgid "chain"
 msgstr "kæde"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 msgid "shell"
 msgstr "skal"
 
@@ -9065,239 +9072,239 @@ msgstr "kritisk markeret politik uden konfigurerede politikker"
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "kunne ikke indhente fingeraftrykket\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, 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:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "antallet af udstedere der matcher: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, 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:818
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "antallet af matchende certifikater: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "kunne ikke allokere keyDB-håndtag\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1260 sm/certchain.c:1264
 msgid "certificate has been revoked"
 msgstr "certifikat er blevet tilbagekaldt"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr "status for certifikatet er ukendt"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, 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:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certifikat er endnu ikke gyldigt"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 msgid "root certificate not yet valid"
 msgstr "rodcertifikat er endnu ikke gyldigt"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr "mellemliggende certifikat er endnu ikke gyldigt"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr "certifikat er udløbet"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 msgid "root certificate has expired"
 msgstr "rodcertifikat er udløbet"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 msgid "intermediate certificate has expired"
 msgstr "mellemliggende certifikat er udløbet"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, 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:1404
 msgid "certificate with invalid validity"
 msgstr "certifikat med ugyldig validitet"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr "underskrift blev ikke oprettet under certifikatets livsforløb"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr "certifikat blev ikke oprettet under udsteders livsforløb"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 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:1448
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (underskr. oprettet den "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certifkat oprettet den "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certifikat gyldigt fra "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (   udsteder gyldig fra "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingeraftryk=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, 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:1505
 #, 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:1511
 #, 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:1570
 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:1634
 msgid "no issuer found in certificate"
 msgstr "ingen udsteder fundet i certifikat"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 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:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "rodcertifikat er ikke markeret som troværdig"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, 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:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr "udstedercertifikat blev ikke fundet"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, 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:1911 dirmngr/validate.c:693
 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:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr "certifikat er gyldigt\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "mellemliggende certifikat er gyldigt\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, c-format
 msgid "root certificate is good\n"
 msgstr "rodcertifikat er gyldigt\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr "skifter til kædemodel"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr "valideringsmodel brugt: %s"
@@ -9320,7 +9327,7 @@ msgstr "uden for kerne\n"
 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:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "ingen"
 
@@ -9355,42 +9362,42 @@ msgstr ""
 "S/N %s, id 0x%08lX,\n"
 "oprettet %s, udløber %s.\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "ingen nøglebrug angivet - antager alle mulige brug\n"
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, 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:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, 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:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, 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:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, 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:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certifikat kan ikke bruges til kryptering\n"
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certifikat kan ikke bruges til underskrivning\n"
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "Included certificates"
 msgid "looking for another certificate\n"
@@ -9982,7 +9989,7 @@ msgstr "hashalgoritme brugt for underskriver %d: %s (%s)\n"
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrollerer for kvalificeret certifikat mislykkedes: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
@@ -10201,7 +10208,7 @@ msgstr "modtagelse af linje mislykkedes: %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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing cache file: %s\n"
@@ -10472,222 +10479,222 @@ msgstr "ugyldig hash-algoritme »%s«\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1849 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:1923
 #, 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:1938
 #, 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:1945
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, 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:1984
 #, 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:2011
 #, 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:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, 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:2084
 #, 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:2226
 #, 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:2233
 #, 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:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, 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:2301
 #, 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:2308
 #, 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:2333
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, 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:2414
 #, 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:2446
 #, 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:2460
 #, 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:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 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:2523
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, 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:2558
 #, 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:2569
 #, 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:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, 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:2733
+#: dirmngr/crlcache.c:2734
 #, 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:2779
+#: dirmngr/crlcache.c:2780
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "crl_cache_insert via issuer failed: %s\n"
@@ -11085,13 +11092,13 @@ msgstr "brug: gpgsm [tilvalg] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, 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:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' failed: %s\n"
 msgid "processing CRL from '%s' failed: %s\n"
@@ -11362,103 +11369,103 @@ msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:582
+#: 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:598 dirmngr/ocsp.c:782
+#: 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:642
+#: 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:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, fuzzy, c-format
 #| msgid "issuer certificate not found"
 msgid "issuer certificate not found: %s\n"
 msgstr "udstedercertifikat blev ikke fundet"
 
-#: dirmngr/ocsp.c:691
+#: 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:698
+#: 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:708
+#: 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:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:753
+#: 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:760
+#: 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:765
+#: 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:822
+#: 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:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11473,72 +11480,72 @@ msgstr "afsendelse af linje mislykkedes: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, 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:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, 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:1743
 #, 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:1776
 #, 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:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, 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:3033
+#: dirmngr/server.c:3049
 #, 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:3054
+#: dirmngr/server.c:3070
 #, 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:3062
+#: dirmngr/server.c:3078
 #, 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:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11893,90 +11900,105 @@ msgstr ""
 "Syntaks: gpg-check-pattern [tilvalg] mønsterfil\n"
 "Kontroller en adgangsfrase angivet på stdin mod mønsterfilen\n"
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: 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:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: tools/gpg-card.c:3758
 #, fuzzy
 #| msgid "  (certificate created at "
 msgid "authenticate to the card"
 msgstr "  (certifkat oprettet den "
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr ""
 
-#: tools/gpg-card.c:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3707
+#: 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:3708
+#: 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:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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"
diff --git a/po/de.gmo b/po/de.gmo
index 679ae14..6e16c8f 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 8d83f01..c557fc1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.3.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
-"PO-Revision-Date: 2022-10-07 09:52+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
+"PO-Revision-Date: 2022-12-16 16:11+0100\n"
 "Last-Translator: Werner Koch <wk@gnupg.org>\n"
 "Language-Team: German <de@li.org>\n"
 "Language: de\n"
@@ -147,8 +147,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Passwort:"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "Keine Ãœbereinstimmung - bitte nochmal versuchen."
 
@@ -197,17 +197,17 @@ msgstr "Hinweis: Anfrage vom Webbrowser."
 msgid "Note: Request from a remote site."
 msgstr "Hinweis: Anfrage von einem anderen Rechner."
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "Fehler beim Holen der Karten-Seriennummer: %s\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Bitte geben Sie das Passwort noch einmal ein:"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -216,7 +216,7 @@ msgstr ""
 "Bitte geben Sie das Passwort ein, um das importierte Objekt im %s System zu "
 "schützen."
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -229,25 +229,25 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -257,12 +257,12 @@ msgstr "'%s' kann nicht geöffnet werden: %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "keine passender Kartenschlüssel gefunden: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "Fehler beim Holen der Liste der Karten: %s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -271,21 +271,21 @@ msgstr ""
 "Ein SSH Prozess möchte folgenden Schlüssel verwenden:%%0A  %s%%0A  "
 "(%s)%%0AErlauben Sie dies?"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Erlauben"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Verweigern"
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -294,7 +294,7 @@ msgstr ""
 "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:3797
+#: agent/command-ssh.c:3837
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "Das Erzeugen eines Datenstroms aus dem Socket schlug fehl: %s\n"
@@ -423,194 +423,198 @@ msgstr "Bitte geben Sie das Passwort ein,%0Aum Ihren Schlüssel zu schützen."
 msgid "Please enter the new passphrase"
 msgstr "Bitte geben Sie das Passwort ein:"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr "Optionen zum Start des Programms"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr "Im Daemon Modus ausführen"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr "Im Server Modus ausführen"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "Im Vordergrund laufen lassen"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr "Ausgabe für /bin/sh"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr "Ausgabe für /bin/csh"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 msgid "|FILE|read options from FILE"
 msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr "Optionen zur Einstellung der Diagnoseausgaben"
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "Reduzierte Informationen"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr "Optionen zur Einstellung der Konfiguration"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 msgid "do not use the SCdaemon"
 msgstr "Den SCdaemon-basierten Kartenzugriff nicht nutzen"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|Benutze PGM als SCdaemon"
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|Benutze PGM als tpm2daemon"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|Einige Kommandos über NAME annehmen"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr "Ignoriere Anfragen, das TTY zu wechseln"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr "Ignoriere Anfragen, das X-Display zu wechseln"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 msgid "enable ssh support"
 msgstr "SSH Unterstützung einschalten"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "Verwende ALGO für SSH Fingerabdrücke"
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 msgid "enable putty support"
 msgstr "PuTTY Unterstützung einschalten"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+msgid "enable Win32-OpenSSH support"
+msgstr "Win32-OpenSSH Unterstützung einschalten"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "Optionen zur Einstellung der Sicherheit"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|Lasse PINs im Cache nach N Sekunden verfallen"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|Lasse SSH Schlüssel im Cache nach N Sekunden verfallen"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|Setze die maximale Lebensdauer von PINs im Cache auf N Sekunden"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|Setze die maximale Lebenszeit von SSH Schlüsseln auf N Sekunden"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr "Benutze PINs im Cache nicht beim Signieren"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 msgid "disallow the use of an external password cache"
 msgstr "Verbiete die Verwendung eines externen Passwordmanagers"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "Verbiete Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 msgid "allow presetting passphrase"
 msgstr "Erlaube ein \"preset\" der Passwörter"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr "Optionen für Passwort Regeln"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr "Einhaltung der Passwort Regeln erzwingen"
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 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:271
+#: agent/gpg-agent.c:279
 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:274
+#: agent/gpg-agent.c:282
 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:278
+#: agent/gpg-agent.c:286
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|Lasse das Passwort nach N Tagen verfallen"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 msgid "do not allow the reuse of old passphrases"
 msgstr "Verbiete die Wiedernutzung alter Passwörter."
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr "Optionen für das Pinentry"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 msgid "never use the PIN-entry"
 msgstr "Niemals das Pinentry benutzen"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr "Aufrufer darf das Pinentry nicht ersetzen"
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "Tastatur und Maus \"grabben\""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|Benutze PGM as PIN-Entry"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|Setze die Pinentry Zeitüberschreitung auf N Sekunden"
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
@@ -619,11 +623,11 @@ 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:570
+#: agent/gpg-agent.c:582
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Gebrauch: @GPG_AGENT@ [Optionen] [Kommando [Argumente]]"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -631,135 +635,135 @@ msgstr ""
 "Syntax: @GPG_AGENT@ [Optionen] [Befehl [Argumente]]\n"
 "Verwaltung von geheimen Schlüsseln für @GNUPG@\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: agent/gpg-agent.c:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "Socket kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Der Name des Sockets `%s' ist zu lang\n"
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, 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:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, 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:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, 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:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "Es wird auf Socket `%s' gehört\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "Verzeichnis `%s' erzeugt\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, 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:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, 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:2768
+#: agent/gpg-agent.c:2882
 #, 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:2773
+#: agent/gpg-agent.c:2887
 #, 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:2848
+#: agent/gpg-agent.c:2962
 #, 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:2853
+#: agent/gpg-agent.c:2967
 #, 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:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s angehalten\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1039,7 +1043,7 @@ msgstr "Prüfung der erstellten Signatur ist fehlgeschlagen: %s\n"
 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:1602
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "Public-Key-Verfahren %d (%s) wird nicht unterstützt\n"
@@ -1054,52 +1058,52 @@ msgstr "Schutzverfahren %d (%s) wird nicht unterstützt\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1129,18 +1133,18 @@ msgstr "WARNUNG: Unsichere Besitzrechte für %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte für %s \"%s\"\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "Warte bis auf die Datei '%s' zugegriffen werden kann ...\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "ja"
 
@@ -1195,8 +1199,8 @@ msgstr ""
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1216,68 +1220,68 @@ msgstr "WARNUNG: \"%s%s\" ist eine veraltete Option - sie hat keine Wirkung.\n"
 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:432 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"
@@ -1425,11 +1429,11 @@ msgstr "Zertifikatkette gültig"
 msgid "Root certificate trustworthy"
 msgstr "Wurzelzertifikat vertrauenswürdig"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 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:1115 sm/certchain.c:1284
 msgid "the available CRL is too old"
 msgstr "Die vorhandene CRL ist zu alt"
 
@@ -1466,7 +1470,7 @@ msgstr "Keine Hilfe für '%s' vorhanden."
 msgid "ignoring garbage line"
 msgstr "Zeile mit nicht identifizierten Zeichen wird ignoriert"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "[none]"
 msgstr "[keine]"
 
@@ -1510,36 +1514,36 @@ msgstr "iconv_open fehlgeschlagen: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "Umwandlung von `%s' in `%s' schlug fehl: %s\n"
 
-#: 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
 #, 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"
@@ -1549,92 +1553,92 @@ msgstr "Warten auf die Freigabe der Dateisperre `%s' ...\n"
 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
+#: 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"
@@ -1642,12 +1646,12 @@ msgstr ""
 "\"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:1462
+#: g10/build-packet.c:1480
 #, c-format
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "[ Nicht als Klartext darstellbar (%zu bytes: %s%s) ]"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1656,34 +1660,34 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und muß mit einem '=' enden\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, 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:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, 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:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n"
@@ -1697,7 +1701,7 @@ msgstr "Die %s \"inquiry\" konnte nicht an den Client weitergeleitet werden\n"
 msgid "Enter passphrase: "
 msgstr "Geben Sie das Passwort ein: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 g10/sign.c:473
 #: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
@@ -1714,7 +1718,7 @@ msgstr "Fehler vom TPM: %s\n"
 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:2330
+#: 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"
@@ -1754,170 +1758,170 @@ msgstr "HTTP Weiterleitung wurde gesäubert"
 msgid "server uses an invalid certificate"
 msgstr "Der Server benutzt eine ungültiges Zertifikat"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "Hr."
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "Fr."
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "zwingend"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 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:1500
+#: g10/card-util.c:803 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:1502
+#: g10/card-util.c:805 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:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Familienname des Kartenbesitzers:"
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Vorname des Kartenbesitzers:"
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Logindaten (Kontenname): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Geheime DO-Daten: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Spracheinstellungen"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 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:1800
+#: g10/card-util.c:1199 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:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "CA-Fingerabdruck: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 msgid "not an OpenPGP card"
 msgstr "Keine gültige OpenPGP-Karte"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr "Vorhandenen Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -1930,102 +1934,102 @@ msgstr ""
 "         fehlschlagen, so ziehen Sie bitte die Dokumentation Ihrer Karte\n"
 "         zu Rate.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr "Ändern des Schlüsselattributs für den: "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 msgid "Signature key\n"
 msgstr "Signatur-Schlüssel\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 msgid "Encryption key\n"
 msgstr "Verschlüsselungs-Schlüssel\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr "Authentisierungs-Schlüssel\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 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:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2036,178 +2040,178 @@ msgstr ""
 "   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:1741
 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:1743 g10/card-util.c:1833
 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:1744 g10/card-util.c:1835
 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:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentisierungs-Schlüssel\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 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:1876
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Das KEYTOCARD Kommando schlug fehl: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 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:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "Menü verlassen"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr "Zeige Admin-Befehle"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "Alle vorhandenen Daten auflisten"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "Kartenbesitzernamen ändern"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 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:3689
+#: g10/card-util.c:2262 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:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "Ändern der Logindaten"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "Ändern der Spracheinstellungen"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 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:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "Ändern des CA-Fingerabdrucks"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 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:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "neue Schlüssel erzeugen"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 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:3698
+#: g10/card-util.c:2271 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:3699
+#: g10/card-util.c:2272 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:3703
+#: g10/card-util.c:2273 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:2275
 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:2276
 msgid "change the key attribute"
 msgstr "Das Schlüsselattribut ändern"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 msgid "Admin-only command\n"
 msgstr "nur-Admin Befehl\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr "Admin-Befehle sind erlaubt\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Befehl\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2271,9 +2275,9 @@ msgstr "Schlüssel"
 msgid "subkey"
 msgstr "Unterschlüssel"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Änderung fehlgeschlagen: %s\n"
@@ -2309,20 +2313,20 @@ msgstr ""
 "WARNUNG: Erzwungene Verwendung des symmetrischen Verschlüsselungsverfahren "
 "%s (%d) verletzt die Empfängervoreinstellungen\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr "(benutze Option \"%s\" zum hinwegsetzen)\n"
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2334,45 +2338,43 @@ 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:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen des Passwortes: %s\n"
 
-#: g10/encrypt.c:481
+#: g10/encrypt.c:473
 #, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
-msgstr ""
-"Aufgrund des S2K-Modus kann ein symmetrisches ESK Paket nicht benutzt "
-"werden\n"
+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:512
+#: g10/encrypt.c:503
 #, c-format
 msgid "using cipher %s.%s\n"
 msgstr "benutze Cipher %s.%s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "`%s' ist bereits komprimiert\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
 
-#: g10/encrypt.c:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, 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:862
+#: g10/encrypt.c:853
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "Lesen von '%s'\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2381,12 +2383,12 @@ msgstr ""
 "WARNUNG: Erzwungenes Kompressionsverfahren %s (%d) verletzt die "
 "Empfängervoreinstellungen.\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, c-format
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s.%s verschlüsselt für: \"%s\"\n"
 
-#: g10/encrypt.c:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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"
@@ -2413,61 +2415,69 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2535,7 +2545,7 @@ msgstr ""
 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:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "Gültige Argumente für Option '%s':\n"
@@ -2608,111 +2618,111 @@ msgstr "Schnell eine User-ID widerrufen"
 msgid "quickly set a new expiration date"
 msgstr "Schnell ein neues Ablaufdatum setzen"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr "Ein neues Schlüsselpaar erzeugen (alle Optionen)"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "quickly sign a key"
 msgstr "Schlüssel schnell signieren"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 msgid "quickly sign a key locally"
 msgstr "Schlüssel schnell nur für diesen Rechner signieren"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "quickly revoke a key signature"
 msgstr "Schnell eine Schlüsselsignatur widerrufen"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "Schlüssel signieren"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "Schlüssel nur für diesen Rechner signieren"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "Signieren oder bearbeiten eines Schlüssels"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "Das Passwort ändern"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "Schlüssel auf einem Schlü.server suchen"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "alle Schlüssel per Schlü.server aktualisieren"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "Schlüssel importieren/kombinieren"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr "den Karten-Status ausgeben"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr "Daten auf einer Karte ändern"
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr "PIN einer Karte ändern"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "Ändern der \"Trust\"-Datenbank"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 msgid "print message digests"
 msgstr "Hashwerte für die Dateien ausgeben"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "Im Server Modus ausführen"
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|WERT|Setze die TOFU-Politik für einen Schlüssel"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|Auch an NAME verschlüsseln"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|Email Alias festlegen"
 
@@ -2728,53 +2738,53 @@ msgstr "Keine wirklichen Änderungen durchführen"
 msgid "prompt before overwriting"
 msgstr "vor Ãœberschreiben nachfragen"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr "Optionen für die Eingabe"
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr "Optionen für die Ausgabe"
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|DATEI|Ausgabe auf DATEI schreiben"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr "Optionen für den Schlüsselimport und -export"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 "|MECHANISMEN|Benutze MECHANISMEN um Schlüssel über die Mailadresse "
 "aufzufinden."
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 msgid "import missing key from a signature"
 msgstr "Schlüssel aus der Signatur importieren"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 msgid "include the public key in signatures"
 msgstr "Schlüssel mit in die Signatur packen"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "Jeglichen Zugriff auf den Dirmngr verhindern"
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr "Optionen für das Auflisten der Schlüssel"
 
@@ -2798,7 +2808,7 @@ msgstr "Optionen für die Verwendung in Scripts"
 msgid "Other options"
 msgstr "Weitere Optionen"
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2807,7 +2817,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
 "Optionen)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2827,11 +2837,11 @@ msgstr ""
 " --list-keys [Namen]        Schlüssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdrücke\" anzeigen\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Aufruf: @GPG@ [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1172
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2841,7 +2851,7 @@ msgstr ""
 "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2849,75 +2859,75 @@ msgstr ""
 "\n"
 "Unterstützte Verfahren:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Öff. Schlüssel: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Verschlü.: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "Aufruf: %s [Optionen] %s\n"
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1698
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, 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:1735
+#: g10/gpg.c:1725
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2925,20 +2935,20 @@ msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
 "Konfigurationsdatei '%s'\n"
 
-#: g10/gpg.c:1738
+#: g10/gpg.c:1728
 #, 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:1744
+#: g10/gpg.c:1734
 #, 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:1747
+#: g10/gpg.c:1737
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2946,479 +2956,468 @@ msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
 "Konfigurationsdatei '%s'\n"
 
-#: g10/gpg.c:1750
+#: g10/gpg.c:1740
 #, 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:1966
+#: g10/gpg.c:1956
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 msgid "show key usage information during key listings"
 msgstr "Schlüsselverwendungszwecke mit den Schlüsseln anlisten"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr "Richtlinien-URL mit den Signaturen anlisten"
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 msgid "show all notations during signature listings"
 msgstr "Alle Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr "Standard Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr "Benutzer-Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "Bevorzugten Schlüsselserver mit den Signaturen anlisten"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 msgid "show the keyring name in key listings"
 msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 msgid "show expiration dates during signature listings"
 msgstr "Das Ablaufdatum mit den Signaturen anlisten"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+msgid "show preferences"
+msgstr "Voreinstellungen anzeigen"
+
+#: g10/gpg.c:2197
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "Unbekannte TOFU Regel '%s'\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(\"help\" um mögliche Werte anzuzeigen)\n"
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, 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:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein gültiges Signaturablaufdatum\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" ist keine gültige E-Mailadresse\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "Ungültiger Subjekt-Name '%s'\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "Ungültiges \"Herkunft\"-Argument '%s'\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "Ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import-Option\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "Ungültige Import-Option\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "Ungültige Filter-Option: %s\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export-Option.\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "Ungültige Export-Option\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Listen-Option.\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr "Ungültige Listen-Option\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr "Foto-ID während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr "Richtlinien-URLs während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 msgid "show all notations during signature verification"
 msgstr "Alle Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr "Standard-Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr "Benutzer-Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 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:3420
+#: g10/gpg.c:3396
 msgid "show user ID validity during signature verification"
 msgstr "Die Gültigkeit der User-ID während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 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:3424
+#: g10/gpg.c:3400
 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:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, 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:3648
+#: g10/gpg.c:3621
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "Ungültiges Argument für Option \"%.50s\"\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, 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:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s zusammen mit %s ist nicht erlaubt!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, 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:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3952
-#, c-format
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "Das ausgewählte AEAD-Verfahren ist ungültig\n"
-
-#: g10/gpg.c:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, 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:3987
+#: g10/gpg.c:3950
 #, 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:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard-Voreinstellungen\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:4015
-#, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr "ungültige private AEAD-Voreinstellungen\n"
-
-#: g10/gpg.c:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "Ungültige \"Chunk\"-Größe; %d wird verwendet\n"
 
-#: g10/gpg.c:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, 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:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, 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:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "Schlüsselexport im SSH Format fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, 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:5366
+#: g10/gpg.c:5322
 #, 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:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Signatur-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
@@ -3431,7 +3430,7 @@ msgstr "|DATEI|Schlüssel aus der Schlüsselbund DATEI nehmen"
 msgid "make timestamp conflicts only a warning"
 msgstr "differierende Zeitangaben sind kein Fehler"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
@@ -3460,153 +3459,153 @@ msgstr "Keine Hilfe vorhanden."
 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"
@@ -3615,175 +3614,175 @@ msgstr ""
 "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:1998 g10/import.c:3146
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "Schlüssel %s: Keine User-ID\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, c-format
 msgid "key %s: %s\n"
 msgstr "Schlüssel %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr "vom Import-Aufpasser zurückgewiesen"
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, 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:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, 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:2793
 #, 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:2801
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "Schlüssel %s: Fehler beim Senden zum gpg-agent: %s\n"
@@ -3796,208 +3795,208 @@ msgstr "Schlüssel %s: Fehler beim Senden zum gpg-agent: %s\n"
 #. * 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:2970
 #, 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:3117
 #, 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:3138 g10/import.c:3177
 #, 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:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "Grund für Widerruf: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "Widerruf-Bemerkung: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, 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:3788
 #, 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:3812
 #, 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:3825
 #, 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:3840
 #, 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:3887
 #, 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:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "Schlüssel %s: Unterschlüssel übersprungen\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "Schlüssel %s: \"direct-key\"-Signaturen hinzugefügt\n"
@@ -4038,14 +4037,14 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "%d doppelte Signatur entfernt\n"
 msgstr[1] "%d doppelte Signaturen entfernt\n"
 
-#: g10/key-check.c:726 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"
 msgstr[0] "%d Beglaubigung wegen fehlendem Schlüssel nicht geprüft\n"
 msgstr[1] "%d Beglaubigungen wegen fehlender Schlüssel nicht geprüft\n"
 
-#: g10/key-check.c:734 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"
@@ -4098,15 +4097,15 @@ msgstr "Schlüsselblockhilfsmittel`%s': %s\n"
 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:262
 msgid "[revocation]"
 msgstr "[Widerruf]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[Eigenbeglaubigung]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4119,17 +4118,17 @@ msgstr ""
 "unterschiedlichen Quellen ...)?\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 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:390 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:408
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4139,52 +4138,52 @@ msgstr ""
 "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:425
 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:553
 #, 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:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  Beglaubigen ist nicht möglich.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User-ID \"%s\" ist abgelaufen."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User-ID \"%s\" ist nicht eigenbeglaubigt."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User-ID \"%s\" ist signierbar."
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr "Wirklich signieren? (j/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4193,11 +4192,11 @@ msgstr ""
 "Die Eigenbeglaubigung von \"%s\"\n"
 "ist eine PGP 2.x artige Signatur.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4206,13 +4205,13 @@ msgstr ""
 "Ihre derzeitige Beglaubigung von \"%s\"\n"
 "ist abgelaufen.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4221,44 +4220,44 @@ msgstr ""
 "Die derzeitige Beglaubigung von \"%s\"\n"
 "ist nur für diesen Rechner gültig.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "Dieser Schlüssel ist verfallen!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4268,32 +4267,32 @@ msgstr ""
 "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:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ich antworte nicht.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, 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:878
 #, 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:881
 #, 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:888
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Ihre Auswahl? ('?' für weitere Informationen): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4302,234 +4301,234 @@ msgstr ""
 "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:923
 msgid "This will be a self-signature.\n"
 msgstr "Dies wird eine Eigenbeglaubigung sein.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 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:935
 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:945
 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:952
 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:959
 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:964
 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:969
 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:981
 msgid "Really sign? (y/N) "
 msgstr "Wirklich signieren? (j/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 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:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "speichern und Menü verlassen"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 msgid "show key fingerprint"
 msgstr "Fingerabdruck des Schlüssels anzeigen"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "show the keygrip"
 msgstr "\"Keygrip\" des Schlüssels anzeigen"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "Schlüssel und User-IDs auflisten"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "User-ID N auswählen"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr "Unterschlüssel N auswählen"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr "Signaturen prüfen"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 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:1286
 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:1287
 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:1289
 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:1291
 msgid "add a user ID"
 msgstr "Eine User-ID hinzufügen"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "Eine Foto-ID hinzufügen"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr "ausgewählte User-IDs entfernen"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr "einen Unterschlüssel hinzufügen"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr "der Smartcard einen Schlüssel hinzufügen"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr "einen Schlüssel auf die Smartcard schieben"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 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:1306
 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:1308
 msgid "delete selected subkeys"
 msgstr "ausgewählte Unterschlüssel entfernen"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "Einen Widerrufschlüssel hinzufügen"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 msgid "delete signatures from the selected user IDs"
 msgstr "Beglaubigungen der ausgewählten User-IDs entfernen"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1314
 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:1316
 msgid "flag the selected user ID as primary"
 msgstr "User-ID als Haupt-User-ID kennzeichnen"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "Liste der Voreinstellungen (für Experten)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "Liste der Voreinstellungen (ausführlich)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 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:1325
 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:1327
 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:1329
 msgid "change the passphrase"
 msgstr "Das Passwort ändern"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "Den \"Ownertrust\" ändern"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 msgid "revoke signatures on the selected user IDs"
 msgstr "Beglaubigungen der ausgewählten User-IDs widerrufen"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 msgid "revoke selected user IDs"
 msgstr "Ausgewählte User-ID widerrufen"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "revoke key or selected subkeys"
 msgstr "Schlüssel oder ausgewählten Unterschlüssel widerrufen"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "enable key"
 msgstr "Schlüssel anschalten"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr "Schlüssel abschalten"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr "ausgewählte Foto-IDs anzeigen"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 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:1349
 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:1470
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schlüssel ist vorhanden.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 msgid "Secret subkeys are available.\n"
 msgstr "Geheimer Unterschlüssel ist vorhanden.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1574
 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:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4542,288 +4541,272 @@ msgstr ""
 "Signaturen\n"
 " (\"nrsign\"), oder jede Kombination davon (\"ltsign\", \"tnrsign\", etc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "Schlüssel wurde widerrufen."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 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:1682
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Wirklich alle User-IDs beglaubigen? (j/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1690
 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:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Benutze den '%s' Befehl.)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 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:1756
 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:1814 g10/keyedit.c:1854
 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 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:1894
 msgid "Command expects a filename argument\n"
 msgstr "Befehl benötigt einen Dateinamen als Argument\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, 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:1934
 #, 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:1969
 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:1975
 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:1977
 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:2015
 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:2016
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Diese User-ID wirklich widerrufen? (j/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2034
 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:2045
 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:2047
 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:2105
 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:2150
 msgid "Set preference list to:\n"
 msgstr "Setze die Liste der Voreinstellungen auf:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 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:2159
 msgid "Really update the preferences? (y/N) "
 msgstr "Die Voreinstellungen wirklich ändern? (j/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Save changes? (y/N) "
 msgstr "Änderungen speichern? (j/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr "Beenden ohne zu speichern? (j/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, 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:2557
+#: g10/keyedit.c:2558
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "Die letzte User-ID kann nicht widerrufen werden!\n"
 
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2584
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "Fehler beim Widerrufen der User-ID: %s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "Fehler beim Setzen der Haupt-User-ID: %s\n"
 
-#: g10/keyedit.c:2677
+#: g10/keyedit.c:2717
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" ist kein Fingerabdruck\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" ist nicht der Fingerabdruck des Hauptschlüssels\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Ungültige User-ID '%s': %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "No matching user IDs."
 msgstr "Keine passende User-ID"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "Nothing to sign.\n"
 msgstr "Nichts zu beglaubigen\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Nicht von Ihnen signiert.\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "Fehler beim Widerruf der Schlüsselsignatur: %s\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3251
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' ist kein gültiges Ablaufdatum\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" ist kein gültiger Fingerabdruck\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "Unterschlüssel \"%s\" nicht gefunden\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr "AEAD: "
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Digest: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Eigenschaften: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr "Keyserver no-modify"
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Bevorzugter Schlüsselserver:"
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr "\"Notationen\": "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "erzeugt: %s"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr "widerrufen: %s"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr "verfallen: %s"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "verfällt: %s"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr "Nutzung: %s"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr "Kartennummer:"
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr "Vertrauen: %s"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr "Gültigkeit: %s"
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4831,18 +4814,18 @@ msgstr ""
 "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 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:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4851,17 +4834,17 @@ msgstr ""
 "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:4253
+#: g10/keyedit.c:4145
 #, 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:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4871,72 +4854,72 @@ msgstr ""
 "könnte\n"
 "         bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
 
-#: g10/keyedit.c:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 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:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 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:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d Beglaubigung entfernt.\n"
 msgstr[1] "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "ungültig"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User-ID \"%s\" bereits verkleinert: %s\n"
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "User-ID \"%s\": %d Signatur entfernt\n"
 msgstr[1] "User-ID \"%s\": %d Signaturen entfernt\n"
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User-ID \"%s\": bereits minimiert\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User-ID \"%s\": bereits sauber\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4946,221 +4929,221 @@ msgstr ""
 "         Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n"
 "         des Schlüssels führen.\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 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:4719
+#: g10/keyedit.c:4611
 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:4788
+#: g10/keyedit.c:4680
 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:4793
+#: g10/keyedit.c:4685
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändern des Verfallsdatums des Unterschlüssels.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 msgid "Changing usage of a subkey.\n"
 msgstr "Ändern des Schlüsselverwendungszweckes des Unterschlüssels.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 msgid "Changing usage of the primary key.\n"
 msgstr "Ändern des Schlüsselverwendungszweckes des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:5033
+#: g10/keyedit.c:4925
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Signaturunterschlüssel %s ist bereits rücksigniert\n"
 
-#: g10/keyedit.c:5039
+#: g10/keyedit.c:4931
 #, 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:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID auswählen.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, 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:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr "Geben Sie die URL Ihres bevorzugten Schlüsselservers ein: "
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie ihn wirklich ersetzen? (j/N) "
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie ihn wirklich löschen? (j/N) "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 msgid "Enter the notation: "
 msgstr "Geben Sie die \"Notation\" ein: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 msgid "Proceed? (y/N) "
 msgstr "Fortfahren (j/N)? "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Keine User-ID mit Hash %s\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Kein Unterschlüssel mit Schlüssel-ID '%s'.\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kein Unterschlüssel mit Index %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \"%s\"\n"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Signatur ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat für diese Signatur erzeugen (j/N)"
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr " (unwiderrufbar)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "widerrufen durch Ihren Schlüssel %s um %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Signatur-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, 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:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Die letzte User-ID kann nicht widerrufen werden!\n"
 
-#: g10/keyedit.c:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Schlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Unterschlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, 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"
@@ -5200,33 +5183,33 @@ msgstr "zu viele AEAD-Einstellungen\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "Ungültiges Feld `%s' in der Voreinstellungszeichenkette\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "Die \"Direct Key Signature\" wird geschrieben\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "Die Eigenbeglaubigung wird geschrieben\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5234,19 +5217,19 @@ msgstr ""
 "WARNUNG: Einige OpenPGP-Programme können einen DSA-Schlüssel dieser "
 "Digestlänge nicht verwenden\n"
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr "Signieren"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr "Zertif."
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr "Verschl."
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr "Authentisierung"
 
@@ -5260,166 +5243,166 @@ msgstr "Authentisierung"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr "SsVvAaQq"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "Mögliche Aktionen für diesen %s Schlüssel: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr "Derzeit erlaubte Vorgänge: "
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Umschalten der Signaturnutzbarkeit\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Umschalten der Verschlüsselungsnutzbarkeit\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Umschalten der Authentisierungsnutzbarkeit\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Beenden\n"
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA und RSA%s\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA und Elgamal%s\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, c-format
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (nur signieren)%s\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2113
 #, c-format
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (nur signieren)%s\n"
 
-#: g10/keygen.c:2142
+#: g10/keygen.c:2119
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (nur verschlüsseln)%s\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, c-format
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (nur verschlüsseln)%s\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2127
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (Nutzung selber einstellbar)%s\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (Nutzung selber einstellbar)%s\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ECC (signieren, verschlüsseln)%s\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 msgid " *default*"
 msgstr " *standard*"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (nur signieren)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) ECC (Nutzung selber einstellbar)%s\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, c-format
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC (nur verschlüsseln)%s\n"
 
-#: g10/keygen.c:2167
+#: g10/keygen.c:2144
 #, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) Vorhandener Schlüssel%s\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) Vorhandener Schlüssel auf der Karte%s\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Geben Sie den \"Keygrip\" ein: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Kein Schlüssel mit diesem \"Keygrip\"\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Karten-Seriennummer: %s\n"
 
-#: g10/keygen.c:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Vorhandene Schlüssel:\n"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "gerundet auf %u Bit\n"
 
-#: g10/keygen.c:2570
+#: g10/keygen.c:2547
 #, 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:2578
+#: g10/keygen.c:2555
 #, 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:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 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:2641
+#: g10/keygen.c:2618
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Bitte wählen Sie, welche elliptische Kurve Sie möchten:\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5435,7 +5418,7 @@ msgstr ""
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5451,38 +5434,38 @@ msgstr ""
 "      <n>m = Schlüssel verfällt nach n Monaten\n"
 "      <n>y = Schlüssel verfällt nach n Jahren\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schlüssel gültig? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Wie lange bleibt die Beglaubigung gültig? (%s) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "Ungültiger Wert.\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr "Schlüssel verfällt nie\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr "Signature verfällt nie\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key verfällt am %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signatur verfällt am %s\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5490,11 +5473,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr "Ist dies richtig? (j/N) "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5508,7 +5491,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5524,41 +5507,41 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Ungültiges Zeichen im Namen\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, 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:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "Email-Adresse: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Diese Email-Adresse ist ungültig\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Ungültiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5569,11 +5552,11 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 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"
 
@@ -5588,31 +5571,31 @@ msgstr "Solch eine User-ID ist bereits für den Schlüssel vorhanden!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfAa"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Ändern: (N)ame, (E)-Mail oder (A)bbrechen? "
 
-#: g10/keygen.c:3148
+#: g10/keygen.c:3125
 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5623,19 +5606,19 @@ msgstr ""
 "unterstützen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
 "tippen, die Maus verwenden oder irgendwelche anderen Programme benutzen.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, 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:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5646,64 +5629,64 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr "Fortsetzen? (J/n) "
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Ein Schlüssel für \"%s\" existiert bereits\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 msgid "Create anyway? (y/N) "
 msgstr "Trotzdem erzeugen? (j/N) "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, c-format
 msgid "creating anyway\n"
 msgstr "wird trotzdem erzeugt\n"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, 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:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Schlüsselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 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"
@@ -5712,7 +5695,7 @@ msgstr ""
 "werden kann.  Sie können aber mit dem Befehl \"--edit-key\" einen\n"
 "Unterschlüssel für diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5720,7 +5703,7 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5728,22 +5711,22 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr "Wirklich erzeugen? (j/N) "
 
@@ -5751,74 +5734,90 @@ msgstr "Wirklich erzeugen? (j/N) "
 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"
 msgstr[0] "%d korrekte Signatur\n"
 msgstr[1] "%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"
 msgstr[0] "%d Beglaubigung aufgrund eines Fehlers nicht geprüft\n"
 msgstr[1] "%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"
 msgstr[0] "WARNUNG: %lu Schlüssel übersprungen, da er zu groß ist\n"
 msgstr[1] "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:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr " Haupt-Fingerabdruck  ="
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr " Unter-Fingerabdruck  ="
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr "  Schl.-Fingerabdruck ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr "      Kartenseriennr. ="
 
@@ -6191,7 +6190,7 @@ msgstr "Binäre"
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "unbekannt"
 
@@ -6335,29 +6334,29 @@ msgstr "nicht komprimiert"
 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:1614
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "Mehrdeutige Option '%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "Unbekannte Option '%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "Unbekanntes schwache Hashverfahren '%s'\n"
@@ -6484,7 +6483,7 @@ msgstr ""
 "%s"
 
 # translated by wk
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6499,72 +6498,72 @@ msgstr ""
 "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:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Dateiname mit JPEG für die Foto-ID eingeben: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, 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:239
 #, 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:241
 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:257
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "`%s' ist keine JPEG-Datei\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Ist dieses Bild richtig? (j/N) "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, 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:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "ungewöhnliches Ende eines externen Programms\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6572,7 +6571,7 @@ msgstr ""
 "Ausführen von externen Programmen ist ausgeschaltet, da die Dateirechte "
 "nicht sicher sind\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "Die Foto-ID kann nicht angezeigt werden!\n"
@@ -6902,12 +6901,12 @@ msgstr "Unbekannter voreingestellter Empfänger \"%s\"\n"
 msgid "no valid addressees\n"
 msgstr "Keine gültigen Adressaten\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, 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:1768
+#: g10/pkclist.c:1766
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Hinweis: Schlüssel %s hat keine Einstellung für %s\n"
@@ -8008,7 +8007,7 @@ msgstr "verwende Vertrauensmodell %s\n"
 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"
@@ -8038,7 +8037,7 @@ msgstr "Bitte ein --check-trustdb durchführen\n"
 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"
@@ -8046,24 +8045,24 @@ msgstr[0] "%d Schlüssel bislang bearbeitet"
 msgstr[1] "%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"
 msgstr[0] " (%d Validity Zähler gelöscht)\n"
 msgstr[1] " (%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"
@@ -8071,7 +8070,7 @@ msgstr ""
 "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 ""
@@ -8196,7 +8195,7 @@ msgstr ""
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8204,7 +8203,7 @@ msgstr "%sNummer: %s%%0ABesitzer: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8234,7 +8233,7 @@ msgstr "|N|Bitte geben Sie den neuen Unblocking-Key ein"
 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:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8319,7 +8318,7 @@ msgstr[1] "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
 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:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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 "
@@ -8327,55 +8326,55 @@ 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Bitte die Admin-PIN eingeben."
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 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:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, 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:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, 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:1654
+#: 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:1701
+#: 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:2074
+#: 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:2082
+#: 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:2092
+#: 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:2102
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8383,7 +8382,7 @@ msgstr ""
 "|NP|Bitte geben Sie einen neuen PIN Entsperrcode (PUK) für den Schlüssel zur "
 "Erstellung qualifizierter Signaturen ein."
 
-#: scd/app-nks.c:2104
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8391,7 +8390,7 @@ msgstr ""
 "|N|Bitte geben Sie den PIN Entsperrcode (PUK) für den Schlüssel zur "
 "Erstellung qualifizierter Signaturen ein."
 
-#: scd/app-nks.c:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
@@ -8651,13 +8650,13 @@ msgstr "Handhabungsroutine für fd %d gestartet\n"
 msgid "handler for fd %d terminated\n"
 msgstr "Handhabungsroutine für den fd %d beendet\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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"
 
@@ -8666,11 +8665,11 @@ msgstr "Der Tor Dienst ist aktiv - Zugriff zum Netz ist eingeschränkt"
 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:199 sm/certchain.c:2211
 msgid "chain"
 msgstr "Kette"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 msgid "shell"
 msgstr "Schale"
 
@@ -8693,245 +8692,245 @@ msgstr "entscheidende Richtlinie ohne konfigurierte Richtlinien"
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "Kann den Fingerprint nicht ermitteln\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, 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:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "Anzahl der übereinstimmenden Herausgeber: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, 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:818
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "Anzahl der übereinstimmenden Zertifikate: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "Kann keinen KeyDB Handler bereitstellen\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1260 sm/certchain.c:1264
 msgid "certificate has been revoked"
 msgstr "Das Zertifikat wurde widerrufen"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr "Der Status des Zertifikats ist nicht bekannt"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, 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:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, 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:1337 sm/certchain.c:1422
 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:1338 sm/certchain.c:1423
 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:1351 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr "Das Zertifikat ist abgelaufen"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 msgid "root certificate has expired"
 msgstr "Das Wurzelzertifikat ist abgelaufen"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 msgid "intermediate certificate has expired"
 msgstr "Das Zwischenzertifikat ist abgelaufen"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "Notwendige Zertifikatattribute fehlen: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1404
 msgid "certificate with invalid validity"
 msgstr "Zertifikat mit unzulässiger Gültigkeit"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 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:1443
 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:1444
 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:1448
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (    Signatur erzeugt am "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (  Zertifikat erzeugt am "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (  Zertifikat gültig von "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  ( Herausgeber gültig von "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingerprint=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, 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:1505
 #, 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:1511
 #, 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:1570
 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:1634
 msgid "no issuer found in certificate"
 msgstr "Im Zertifikat ist kein Herausgeber enthalten"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 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:1785 dirmngr/validate.c:576
 #, 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:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, 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:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr "Herausgeberzertifikat nicht gefunden"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, 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:1911 dirmngr/validate.c:693
 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:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr "Das Zertifikat ist korrekt\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Das Zwischenzertifikat ist korrekt\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, c-format
 msgid "root certificate is good\n"
 msgstr "Das Wurzelzertifikat ist korrekt\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr "Umgeschaltet auf das Kettenmodell"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr "Benutztes Gültigkeitsmodell: %s"
@@ -8955,7 +8954,7 @@ msgstr "Nicht genügend Speicher\n"
 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:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "keine"
 
@@ -8991,45 +8990,45 @@ msgstr ""
 "gültig von %s bis %s\n"
 "zu entsperren.\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, 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:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, 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:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, 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:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, 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:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, 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:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "Das Zertifikat kann nicht zum Verschlüsseln benutzt werden\n"
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "Das Zertifikat kann nicht zum Signieren benutzt werden\n"
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "schaue nach einem anderen Zertifikat\n"
@@ -9586,7 +9585,7 @@ msgstr "Benutztes Hashverfahren für Unterzeichner %d: %s (%s)\n"
 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:916
 #, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "%s/%s Signatur mittels %s Schlüssel %s\n"
@@ -9783,7 +9782,7 @@ msgstr "Die Zwischenspeicherdatei `%s' wird entfernt\n"
 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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "Fehler beim Schließen der Zwischenspeicherdatei: %s\n"
@@ -10047,138 +10046,138 @@ msgstr "Ungültige Hashmethode `%s'\n"
 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:1849 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:1923
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1938
 #, 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:1945
 #, 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:1949
 #, 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:1969
 #, 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:1984
 #, 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:2011
 #, 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:2026
 #, 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:2072
 #, 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:2084
 #, 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:2226
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2233
 #, 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:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2301
 #, 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:2308
 #, 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:2333
 #, 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:2337
 #, 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:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "Unbekannte kritische CRL Erweiterung %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, 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:2414
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "Zwischenspeicherdatei `%s' wird erzeugt\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, 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:2460
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10187,70 +10186,70 @@ msgstr ""
 "Update der Zwischenspeicherverzeichnisdatei fehlgeschlagen - "
 "Zwischenspeichereintrag wird mit dem nächste Programmstart verloren gehen\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2497
 #, 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:2520
 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:2523
 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:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr " FEHLER: Die CRL wird nicht benutzt\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 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:2551
 #, 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:2558
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "Problem beim Lesen eines Zwischenspeicherdatensatzes: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2569
 #, 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:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr "Ende CRL Ausgabe\n"
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch über den DP fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert über den DP fehlgeschlagen: %s\n"
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert über den Issuer fehlgeschlagen: %s\n"
@@ -10593,12 +10592,12 @@ msgstr "Aufruf: %s [Optionen] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "Doppelpunkte sind im Namen des Sockets nicht erlaubt\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n"
@@ -10844,92 +10843,92 @@ msgstr "Hashen der OCSP Antwort für `%s' fehlgeschlagen: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "Nicht durch voreingestelltes OCSP \"Signer-Zertifikat\" signiert"
 
-#: dirmngr/ocsp.c:582
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "malloc() fehlgeschlagen: %s\n"
 
-#: dirmngr/ocsp.c:598 dirmngr/ocsp.c:782
+#: 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:642
+#: 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:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "Herausgeberzertifikat nicht gefunden: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: 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:698
+#: 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:708
+#: 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:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "Kein  voreingestellter OCSP Responder definiert\n"
 
-#: dirmngr/ocsp.c:753
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "Kein voreingestellter OCSP \"Signer\" definiert\n"
 
-#: dirmngr/ocsp.c:760
+#: 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:765
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "Der OCSP Responder `%s' wird benutzt\n"
 
-#: dirmngr/ocsp.c:822
+#: 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:847
+#: 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:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "Gut"
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: 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:901
+#: 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:916
+#: 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"
@@ -10943,63 +10942,63 @@ msgstr "assuan_inquire(%s) fehlgeschlagen: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire fehlgeschlagen: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "Fehler beim Senden der Daten: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch fehlgeschlagen: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1776
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert fehlgeschlagen: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d überschritten\n"
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "Fehler beim Erzeugen der Kontrollstruktur: %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "Fehler beim Bereitstellen eines Assuan Kontext: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "Fehler beim Initialisieren des Servers: %s\n"
 
-#: dirmngr/server.c:3062
+#: dirmngr/server.c:3078
 #, 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:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept Problem: %s\n"
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan Verarbeitung fehlgeschlagen: %s\n"
@@ -11307,34 +11306,34 @@ msgstr ""
 "Syntax: gpg-check-pattern [optionen] Musterdatei\n"
 "Das von stdin gelesene Passwort gegen die Musterdatei prüfen\n"
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: 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:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: 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:3437 tools/gpg-card.c:3451
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -11343,47 +11342,56 @@ msgstr ""
 "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:3454
+#: 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:3700
+#: tools/gpg-card.c:3758
 msgid "authenticate to the card"
 msgstr "Gegen die Karte authentifizieren"
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr "Ein Reset an den SCdaemon senden"
 
-#: tools/gpg-card.c:3704
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "Einrichten der KDF zur Authentifizierung"
 
-#: tools/gpg-card.c:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr "Ein privates Datenobjekt ändern"
 
-#: tools/gpg-card.c:3707
+#: tools/gpg-card.c:3765
 msgid "read a certificate from a data object"
 msgstr "Ein Zertifikat aus einem Datenobjekt lesen"
 
-#: tools/gpg-card.c:3708
+#: tools/gpg-card.c:3766
 msgid "store a certificate to a data object"
 msgstr "Ein Zertifikat in einem Datenobjekt speichern"
 
-#: tools/gpg-card.c:3709
+#: 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:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr "Verwaltungskommandos für Yubikeys"
 
-#: tools/gpg-card.c:3712
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr "Verwaltung der Kommandohistorie"
 
+#~ 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) "
diff --git a/po/el.gmo b/po/el.gmo
index 75631c5..81f53b2 100644
--- a/po/el.gmo
+++ b/po/el.gmo
diff --git a/po/el.po b/po/el.po
index 0116052..e1a3e98 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2017-09-14 21:14+0300\n"
 "Last-Translator: Dimitris Maroulidis <dmaroulidis@dimitrismaroulidis.com>\n"
 "Language-Team: team@gnome.gr\n"
@@ -143,8 +143,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "κακή φ�άση κλειδί"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
@@ -198,25 +198,25 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί· αυτή είναι μια μυστική π�όταση \n"
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -227,26 +227,26 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -257,39 +257,39 @@ msgstr "αδυναμία π�όσβασης στο `%s': %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "δε β�έθηκε εγγ�άψιμη μυστική κλειδοθήκη: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, 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:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί· αυτή είναι μια μυστική π�όταση \n"
 
-#: agent/command-ssh.c:3100
+#: agent/command-ssh.c:3105
 #, 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:3797
+#: agent/command-ssh.c:3837
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: αδυναμία δημιου�γίας hashtable: %s\n"
@@ -420,208 +420,214 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|ΑΡΧΕΙΟ|φό�τωμα του α�θ�ώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "αναλυτικά"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "ήσυχη έξοδος"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "ανανέωση της βάσης δεδομένων εμπιστοσ�νης"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|Ο�ΟΜΑ|καθο�ισμός του σετ χα�ακτή�ων τε�ματικο� σε Ο�ΟΜΑ"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "δεν υποστη�ίζεται"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "δεν υποστη�ίζεται"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "δεν υποστη�ίζεται"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|χ�ήση της κατάστασης φ�άσης κλειδί N"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "χ�ήση του gpg-agent"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
@@ -629,149 +635,149 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Αναφέ�ετε τα π�οβλήματα στο <gnupg-bugs@gnu.org>\n"
 
-#: agent/gpg-agent.c:570
+#: agent/gpg-agent.c:582
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Χ�ήση: gpg [επιλογές] [α�χεία] (-h για βοήθεια)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγό�ιθμος πε�ίληψης δεν είναι έγκυ�ος\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "ανάγνωση επιλογών από `%s'\n"
 
-#: agent/gpg-agent.c:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "αδυναμία δημιου�γίας του %s: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, fuzzy, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδ�ία\n"
 
-#: agent/gpg-agent.c:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, 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:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: κατάλογος δημιου�γήθηκε\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: read απέτυχε (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: αδυναμία δημιου�γίας καταλόγου: %s\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2853
+#: agent/gpg-agent.c:2967
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "η ενημέ�ωση μυστικο� απέτυχε: %s\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: πα�αλείφθηκε: %s\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1033,7 +1039,7 @@ msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημ
 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:1602
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1051,52 +1057,52 @@ msgstr "δεν υποστη�ίζεται ο αλγό�ιθμος π�οστασ
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1127,18 +1133,18 @@ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία σÏ
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "η ενημέ�ωση απέτυχε: %s\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "ναι|ναί"
 
@@ -1193,8 +1199,8 @@ msgstr ""
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "αδυναμία δημιου�γίας της κλειδοθήκης `%s': %s\n"
@@ -1214,69 +1220,69 @@ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστ
 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:432 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"
@@ -1444,12 +1450,12 @@ msgstr "Αυτό το κλειδί έχει λήξει!"
 msgid "Root certificate trustworthy"
 msgstr "κακό πιστοποιητικό"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "κακό πιστοποιητικό"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Κλειδί διαθέσιμο στο: "
@@ -1491,7 +1497,7 @@ msgstr "Δεν υπά�χει διαθέσιμη βοήθεια για `%s'"
 msgid "ignoring garbage line"
 msgstr "σφάλμα στη γ�αμμή trailer\n"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 #, fuzzy
 msgid "[none]"
 msgstr "άγνωστο"
@@ -1536,36 +1542,36 @@ msgstr "αδυναμία π�όσβασης του α�χείου: %s\n"
 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
 #, 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"
@@ -1575,92 +1581,92 @@ msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: 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"
@@ -1668,13 +1674,13 @@ msgstr ""
 "εκτυπώσιμος, σε εισαγωγικά, χα�ακτή�ας στη θω�άκιση - ίσως έγινε χ�ήση "
 "π�οβληματικο� MTA\n"
 
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "μη αναγνώσιμο"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1683,27 +1689,27 @@ msgstr ""
 "ένα όνομα σημείωσης μπο�εί να πε�ιέχει μόνο εκτυπώσιμους χα�ακτή�ες και κενά "
 "και να λήγει με ένα '='\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "το όνομα σημείωσης χ�ήστη π�έπει να πε�ιέχει το '@' χα�ακτή�α\n"
 
-#: g10/build-packet.c:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, fuzzy, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "το όνομα σημείωσης χ�ήστη π�έπει να πε�ιέχει το '@' χα�ακτή�α\n"
 
-#: g10/build-packet.c:1550
+#: g10/build-packet.c:1568
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "η τιμή σημείωσης π�έπει να μη χ�ησιμοποιεί χα�ακτή�ες control\n"
 
-#: g10/build-packet.c:1606
+#: g10/build-packet.c:1624
 #, fuzzy, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "το όνομα σημείωσης χ�ήστη π�έπει να πε�ιέχει το '@' χα�ακτή�α\n"
 
-#: g10/build-packet.c:1612
+#: g10/build-packet.c:1630
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1713,7 +1719,7 @@ msgstr ""
 "ένα όνομα σημείωσης μπο�εί να πε�ιέχει μόνο εκτυπώσιμους χα�ακτή�ες και κενά "
 "και να λήγει με ένα '='\n"
 
-#: g10/build-packet.c:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: β�έθηκαν μη έγκυ�α δεδομένα σημείωσης\n"
@@ -1727,7 +1733,7 @@ msgstr ""
 msgid "Enter passphrase: "
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 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"
@@ -1745,7 +1751,7 @@ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 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:2330
+#: 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"
@@ -1788,177 +1794,177 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "δημιου�γία ενός πιστοποιητικο� ανάκλησης"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Η επιλογή σας; "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 #, fuzzy
 msgid "not forced"
 msgstr "μη επεξε�γασμένο"
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1500
+#: g10/card-util.c:803 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1502
+#: g10/card-util.c:805 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "αναωεωμένες επιλογές"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 tools/gpg-card.c:1804
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Η δημιου�γία κλειδιο� απέτυχε: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1297
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "δε β�έθηκαν έγκυ�α OpenPGP δεδομένα.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "αδυναμία εγγ�αφής μυστικής κλειδοθήκης `%s': %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1395
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -1966,102 +1972,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Υπογ�αφή έληξε στις %s.\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 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:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Μη έγκυ�η επιλογή.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, fuzzy, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "πα�αλείφθηκε: μυστικό κλειδί ήδη πα�ών\n"
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2429
+#: g10/card-util.c:1694 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2069,197 +2075,197 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 #, 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:1743 g10/card-util.c:1833
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Υπογ�αφή έληξε στις %s.\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1744 g10/card-util.c:1835
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Πα�ακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1876
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "η ενημέ�ωση απέτυχε: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, fuzzy, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "τε�ματισμός αυτο� του μενο�"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 #, fuzzy
 msgid "show admin commands"
 msgstr "συγκ�ουόμενες εντολές\n"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "απεικόνιση αυτής της βοήθειας"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 tools/gpg-card.c:3743
 #, fuzzy
 msgid "list all available data"
 msgstr "Κλειδί διαθέσιμο στο: "
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3689
+#: g10/card-util.c:2262 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 #, fuzzy
 msgid "change the login name"
 msgstr "αλλαγή της ημε�ομηνίας λήξης"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 #, fuzzy
 msgid "change the language preferences"
 msgstr "αλλαγή της εμπιστοσ�νης ιδιοκτήτη"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 #, fuzzy
 msgid "generate new keys"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3698
+#: g10/card-util.c:2271 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 #, 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:2276
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "αλλαγή της εμπιστοσ�νης ιδιοκτήτη"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "συγκ�ουόμενες εντολές\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "συγκ�ουόμενες εντολές\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Μη έγκυ�η εντολή  (δοκιμάστε \"help\")\n"
 
-#: g10/decrypt.c:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output δεν λειτου�γεί για αυτή την εντολή\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2321,9 +2327,9 @@ msgstr "key"
 msgid "subkey"
 msgstr "ΔημοσΚλειδί:"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "η ενημέ�ωση απέτυχε: %s\n"
@@ -2357,18 +2363,18 @@ msgstr ""
 "ο εξαναγκασμός συμμετ�ικο� αλγό�ιθμου %s (%d) πα�αβιάζει τις\n"
 "επιλογές του πα�αλήπτη\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used for encryption\n"
 msgstr "απαγο�ε�ετε η χ�ήση του κ�υπταλγό�ιθμου \"%s\" στην κατάσταση %s\n"
 
-#: g10/encrypt.c:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "απαγο�ε�ετε η χ�ήση του κ�υπταλγό�ιθμου \"%s\" στην κατάσταση %s\n"
@@ -2378,48 +2384,49 @@ msgstr "απαγο�ε�ετε η χ�ήση του κ�υπταλγό�ιθμο
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
 
-#: g10/encrypt.c:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "χ�ήση του κ�υπταλγό�ιθμου: %s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' ήδη συμπιέστηκε\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, 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:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "απαγο�ε�ετε η χ�ήση του αλγό�ιθμου πε�ίληψης \"%s\" στην κατάσταση %s\n"
 
-#: g10/encrypt.c:862
+#: g10/encrypt.c:853
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "ανάγνωση από `%s'\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2428,13 +2435,13 @@ msgstr ""
 "ο εξαναγκασμός χ�ήσης του αλγο�ίθμου συμπίεσης %s (%d) πα�αβιάζει τις\n"
 "επιλογές του πα�αλήπτη\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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"
@@ -2464,7 +2471,7 @@ msgstr ""
 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 ""
@@ -2472,63 +2479,74 @@ msgstr ""
 "Η υπογ�αφή θα σημειωθεί σαν μη-ανακαλέσιμη.\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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έγινε καμμία εξαγωγή\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2598,7 +2616,7 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "χ�ήση του δευτε�ε�οντος κλειδιο� %08lX αντί του π�ωτε�οντος %08lX\n"
 
-#: g10/getkey.c:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
@@ -2682,120 +2700,120 @@ msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 msgid "quickly set a new expiration date"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "δημιου�γία ενός πιστοποιητικο� ανάκλησης"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "αφαί�εση των κλειδιών από τη δημόσια κλειδοθήκη"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "αφαί�εση των κλειδιών από τη μυστική κλειδοθήκη"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "υπογ�αφή ενός κλειδιο�"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "υπογ�αφή ενός κλειδιο� τοπικά"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "υπογ�αφή ενός κλειδιο�"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "υπογ�αφή ενός κλειδιο� τοπικά"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "υπογ�αφή ή επεξε�γασία ενός κλειδιο�"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "εξαγωγή κλειδιών"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "εξαγωγή κλειδιών σε ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "εισαγωγή κλειδιών από ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "αναζήτηση κλειδιών σε ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "ανανέωση όλων των κλειδιών από ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "εισαγωγή/συγχώνευση κλειδιών"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "ανανέωση της βάσης δεδομένων εμπιστοσ�νης"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 #, fuzzy
 msgid "print message digests"
 msgstr "|αλγό� [α�χεία]| απεικόνιση πε�ιλήψεων των μηνυμάτων"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|Ο�ΟΜΑ|χ�ήση Ο�ΟΜΑτος σαν π�οκαθο�ισμένο μυστικό κλειδί"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|Ο�ΟΜΑ|κ�υπτογ�άφηση για Ο�ΟΜΑ"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
@@ -2811,56 +2829,56 @@ msgstr "να μη γίνει καμμία αλλαγή"
 msgid "prompt before overwriting"
 msgstr "ε�ώτηση π�ιν την επικάλυψη"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "δημιου�γία ascii θω�ακισμένης εξόδου"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|ΑΡΧΕΙΟ|φό�τωμα του α�θ�ώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "χ�ήση κανονικής κατάστασης κειμένου"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|καθο�ισμός επιπέδου συμπίεσης N (0 απενε�γοποιεί)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "εισαγωγή κλειδιών από ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "έλεγχος υπογ�αφής κλειδιο�"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2888,7 +2906,7 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2896,7 +2914,7 @@ msgstr ""
 "@\n"
 "(δείτε τη σελίδα man για μια πλή�η λίστα εντολών και επιλογών)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2926,13 +2944,13 @@ msgstr ""
 " --list-keys [ονόματα]        απεικόνιση κλειδιών\n"
 " --fingerprint [ονόματα]      απεικόνιση αποτυπωμάτων (fingerprints)\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Χ�ήση: gpg [επιλογές] [α�χεία] (-h για βοήθεια)"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2947,7 +2965,7 @@ msgstr ""
 "υπογ�αφή, έλεγχος, κ�υπτογ�άφηση ή αποκ�υπτογ�άφηση\n"
 "η π�οκαθο�ισμένη λειτου�γία εξα�τάται από τα δεδομένα εισόδου\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2955,578 +2973,567 @@ msgstr ""
 "\n"
 "Υποστη�ιζόμενοι αλγό�ιθμοι:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "ΔημοσΚλειδί:"
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Κ�υπταλγό�ιθμος: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Συμπίεση: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "χ�ήση: gpg [επιλογές] "
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "συγκ�ουόμενες εντολές\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "δεν β�έθηκε το σ�μβολο = στον ο�ισμό της ομάδας \"%s\"\n"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1698
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1716
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1735
+#: g10/gpg.c:1725
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1738
+#: g10/gpg.c:1728
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1744
+#: g10/gpg.c:1734
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1747
+#: g10/gpg.c:1737
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1750
+#: g10/gpg.c:1740
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1966
+#: g10/gpg.c:1956
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "άγνωστο αντικείμενο �υθμίσεως \"%s\"\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Δεν β�έθηκε αντίστοιχη υπογ�αφή στη μυστική κλειδοθήκη\n"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Δεν β�έθηκε αντίστοιχη υπογ�αφή στη μυστική κλειδοθήκη\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "το URL πολιτικής υπογ�αφής που δόθηκε δεν είναι έγκυ�ο\n"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "απεικόνιση της κλειδοθήκης στην οποία αναφέ�ετε το κλειδί"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Δεν β�έθηκε αντίστοιχη υπογ�αφή στη μυστική κλειδοθήκη\n"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "ο�ισμός απεικόνισης επιλογών"
+
+#: g10/gpg.c:2197
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "άγνωστος π�οκαθο�ισμένος πα�αλήπτης `%s'\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Αυτή η εντολή απαγο�ε�ετε σε αυτή την κατάσταση %s.\n"
 
-#: g10/gpg.c:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, 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:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Μη έγκυ�η διε�θυνση Email\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "μη έγκυ�ος αλγό�ιθμος  hash `%s'\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "αδυναμία επεξε�γασίας του URI του διακομιση κλειδιών\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "το URL πολιτικής υπογ�αφής που δόθηκε δεν είναι έγκυ�ο\n"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "αδυναμία ο�ισμο� του exec-path σε %s\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το π�όγ�αμμα ίσως δημιου�γήσει α�χείο core!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το %s πα�ακάμπτει το %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "το %s δεν επιτ�έπεται με το %s!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "το %s δεν έχει καμμία έννοια μαζί με το %s!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: g10/gpg.c:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγό�ιθμος κ�υπτογ�άφησης δεν είναι έγκυ�ος\n"
 
-#: g10/gpg.c:3952
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "ο επιλεγμένος αλγό�ιθμος πε�ίληψης δεν είναι έγκυ�ος\n"
-
-#: g10/gpg.c:3964
+#: g10/gpg.c:3927
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγό�ιθμος κ�υπτογ�άφησης δεν είναι έγκυ�ος\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "ο επιλεγμένος αλγό�ιθμος πε�ίληψης για πιστοποίηση\n"
 "δεν είναι έγκυ�ος\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed π�έπει να είναι μεγαλ�τε�α από 0\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed π�έπει να είναι μεγαλ�τε�α από 1\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "μη έγκυ�η κατάσταση S2K; π�έπει να είναι 0, 1 ή 3\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "μη έγκυ�ες π�οεπιλογές\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "μη έγκυ�ες π�οεπιλογές π�οσωπικο� κ�υπταλγό�ιθμου\n"
 
-#: g10/gpg.c:4015
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "μη έγκυ�ες π�οεπιλογές π�οσωπικο� κ�υπταλγό�ιθμου\n"
-
-#: g10/gpg.c:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "μη έγκυ�ες π�οεπιλογές π�οσωπικο� αλγό�ιθμου πε�ίληψης\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "μη έγκυ�ες π�οεπιλογές π�οσωπικο� αλγό�ιθμου συμπίεσης\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "μη έγκυ�ο μέγεθος κλειδιο�, χ�ήση %u bits\n"
 
-#: g10/gpg.c:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "το %s ακόμα δε λειτου�γεί μαζί με το %s\n"
 
-#: g10/gpg.c:4137
-#, fuzzy, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "απαγο�ε�ετε η χ�ήση του κ�υπταλγό�ιθμου \"%s\" στην κατάσταση %s\n"
-
-#: g10/gpg.c:4149
+#: g10/gpg.c:4097
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "απαγο�ε�ετε η χ�ήση του αλγό�ιθμου συμπίεσης \"%s\" στην κατάσταση %s\n"
 
-#: g10/gpg.c:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δώθηκαν πα�αλήπτες (-r) χώ�ις χ�ήση κ�υπτογ�άφησης\n"
 "δημοσίου κλειδιο�\n"
 
-#: g10/gpg.c:4388
+#: g10/gpg.c:4336
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "αποκ�υπτογ�άφηση απέτυχε: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4420
+#: g10/gpg.c:4368
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "απαγο�ε�ετε η χ�ήση του %s στην κατάσταση %s.\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4426
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4481
+#: g10/gpg.c:4429
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "απαγο�ε�ετε η χ�ήση του %s στην κατάσταση %s.\n"
 
-#: g10/gpg.c:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver αποστολή απέτυχε: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver λήψη απέτυχε: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "εξαγωγή κλειδιο� απέτυχε: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "εξαγωγή κλειδιο� απέτυχε: %s\n"
 
-#: g10/gpg.c:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver αναζήτηση απέτυχε: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver ανανέωση απέτυχε: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "αποθω�άκιση απέτυχε: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "μη έγκυ�ος αλγό�ιθμος  hash `%s'\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: g10/gpg.c:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Μπο�είτε τώ�α να εισαγάγετε το μήνυμα σας ...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "το URL πολιτικής πιστοποιητικο� που δόθηκε δεν είναι έγκυ�ο\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "το URL πολιτικής υπογ�αφής που δόθηκε δεν είναι έγκυ�ο\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "το URL πολιτικής υπογ�αφής που δόθηκε δεν είναι έγκυ�ο\n"
@@ -3540,7 +3547,7 @@ msgstr "εξαγωγή των κλειδιών από αυτή τη κλειδο
 msgid "make timestamp conflicts only a warning"
 msgstr "ο�ισμός των συγκ�ο�σεων ώ�ας (timestamp) μόνο σαν π�οειδοποίηση"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|εγγ�αφή των πλη�οφο�ιών κατάστασης στο FD"
 
@@ -3571,335 +3578,335 @@ msgstr "Δεν υπά�χει διαθέσιμη βοήθεια"
 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:1998 g10/import.c:3146
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "κλειδί %08lX: δεν υπά�χει αυτό το user ID\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "πα�αλείφθηκε `%s': %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "κλειδί %08lX: επιδιό�θωση φθα�μένου υποκλειδιο� HKP\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2075
 #, 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:2086 g10/import.c:2117
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "κλειδί %08lX: δεν έχει έγκυ�α user ID\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2088
 #, 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:2167 g10/import.c:3533
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "κλειδί %08lX: μυστικό κλειδί που δε β�έθηκε: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2173
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "κλειδί %08lX:  νέο κλειδί - πα�αλείφθηκε\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "κλειδί %08lX: το δημόσιο κλειδί \"%s\" έχει εισαχθεί\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2267
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "κλειδί %08lX: δεν ται�ιάζει με το αντίγ�αφο μας\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2335
 #, 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:2338
 #, 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:2341
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "κλειδί %08lX: \"%s\" 1 νέα υπογ�αφή\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2344
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "κλειδί %08lX: \"%s\" %d νέες υπογ�αφές\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2347
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "κλειδί %08lX: \"%s\" 1 νέο υποκλειδί\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2350
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "κλειδί %08lX: \"%s\" %d νέα υποκλειδιά\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2353
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "κλειδί %08lX: \"%s\" %d νέες υπογ�αφές\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2356
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "κλειδί %08lX: \"%s\" %d νέες υπογ�αφές\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "κλειδί %08lX: μυστικό κλειδί εισήχθηκε\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, 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:2801
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
@@ -3912,207 +3919,207 @@ msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, fuzzy, c-format
 msgid "secret key %s: %s\n"
 msgstr "το μυστικό κλειδί `%s' δε β�έθηκε: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3138 g10/import.c:3177
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "αιτία για ανάκληση:"
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "σχόλιο ανάκλησης:"
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "κλειδί %08lX: αδυναμία εντοπισμο� του α�χικο� τμήματος κλειδιο�: %s\n"
 
-#: g10/import.c:3492
+#: g10/import.c:3562
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "κλειδί %08lX: αδυναμία ανάγνωσης του α�χικο� τμήματος κλειδιο�: %s\n"
 
-#: g10/import.c:3512
+#: g10/import.c:3582
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "κλειδί %08lX: μη έγκυ�ο πιστοποιητικό ανάκλησης: %s - από��ιψη\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3617
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "κλειδί %08lX: \"%s\" πιστοποιητικό ανάκλησης εισήχθηκε\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3703
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "κλειδί %08lX: δεν υπά�χει user ID για την υπογ�αφή\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "κλειδί %08lX: μη υποστη�ιζόμενος αλγό�ιθμος δημοσίου κλειδιο�\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3740
 #, fuzzy, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "κλειδί %08lX: άμεση υπογ�αφή κλειδιο� π�οστέθηκε\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3754
 #, fuzzy, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "κλειδί %08lX: δεν υπά�χει υποκλειδί για τη δέσμευση κλειδιο�\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3769
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "κλειδί %08lX: μη έγκυ�η δέσμευση υποκλειδιο�\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3788
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "κλειδί %08lX: αφαι�έθηκε η δέσμευση πολλαπλο� υποκλειδιο�\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3812
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "κλειδί %08lX: δεν υπά�χει υποκλειδί για την ανάκληση κλειδιο�\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3825
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "κλειδί %08lX: μη έγκυ�η ανάκληση υποκλειδιο�\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3840
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "κλειδί %08lX: αφαι�έθηκε η ανάκληση πολλαπλο� υποκλειδιο�\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3887
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "κλειδί %08lX: πα�αλείφθηκε user ID '"
 
-#: g10/import.c:3841
+#: g10/import.c:3914
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "κλειδί %08lX: πα�αλείφθηκε υποκλειδί\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "κλειδί %08lX: το πιστοποιητικό ανάκλησης σε λάθος σημείο - πα�αλείφθηκε\n"
 
-#: g10/import.c:3902
+#: g10/import.c:3985
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "κλειδί %08lX: μη έγκυ�ο πιστοποιητικό ανάκλησης: %s - πα�αλείφθηκε\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4009
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "κλειδί %08lX: η υπογ�αφή του υποκλειδιο� σε λάθος σημείο - πα�αλείφθηκε\n"
 
-#: g10/import.c:3924
+#: g10/import.c:4017
 #, 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:4190
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "κλειδί %08lX: εντοπίστηκε διπλό user ID - ενώθηκαν\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4297
 #, fuzzy, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "κλειδί %08lX: εντοπίστηκε διπλό user ID - ενώθηκαν\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4362
 #, 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:4378
 #, 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:4444
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "κλειδί %08lX: \"%s\" πιστοποιητικό ανάκλησης π�οστέθηκε\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4482
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "κλειδί %08lX: άμεση υπογ�αφή κλειδιο� π�οστέθηκε\n"
@@ -4150,7 +4157,7 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "Το user ID \"%s\" ανακαλείτε."
 msgstr[1] "Το user ID \"%s\" ανακαλείτε."
 
-#: g10/key-check.c:726 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"
@@ -4158,7 +4165,7 @@ msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr[0] "1 υπογ�αφή δεν ελέγχθηκε λόγω χαμένου κλειδιο�\n"
 msgstr[1] "1 υπογ�αφή δεν ελέγχθηκε λόγω χαμένου κλειδιο�\n"
 
-#: g10/key-check.c:734 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,15 +4219,15 @@ msgstr "σφάλμα κατά τη δημιου�γία του `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[revocation]"
 msgstr "[ανάκληση]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[ιδιο-υπογ�αφή]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4233,68 +4240,68 @@ msgstr ""
 "να κοιτάζει passports και fingerprints από διάφο�ες πηγές...);\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 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:390 g10/pkclist.c:291
 #, fuzzy, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Έχω πλή�η εμπιστοσ�νη\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:408
 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:425
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  Αδυναμία υπογ�αφής.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Το user ID \"%s\" έχει έληξε."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το user ID \"%s\" δεν έχει ιδιο-υπογ�αφεί."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:646
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το user ID \"%s\" δεν έχει ιδιο-υπογ�αφεί."
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Σίγου�α να υπογ�αφεί; "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4303,11 +4310,11 @@ msgstr ""
 "Η ιδιο-υπογ�αφή στο \"%s\"\n"
 "είναι μια υπογ�αφή τ�που PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4316,12 +4323,12 @@ msgstr ""
 "Η π�ουπά�χουσα υπογ�αφή σας στο \"%s\"\n"
 "έχει λήξει.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4330,43 +4337,43 @@ msgstr ""
 "Η π�ουπά�χουσα υπογ�αφή σας στο \"%s\"\n"
 "είναι μια τοπική υπογ�αφή.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Θέλετε να τη π�οάγετε σε μια πλή�η εξαγώγιμη υπογ�αφή; (y/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:748
 #, fuzzy, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" ήδη υπογ�άφθηκε από το κλειδί %08lX\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, fuzzy, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" ήδη υπογ�άφθηκε από το κλειδί %08lX\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:758
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Σίγου�α θέλετε ακόμα να το ξαναυπογ�άψετε; (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 #, fuzzy, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "Τίποτα για να υπογ�αφεί με το κλειδί  %08lX\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:804
 msgid "This key has expired!"
 msgstr "Αυτό το κλειδί έχει λήξει!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Αυτό το κλειδί π�όκειτε να λήξει στις %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Θέλετε η υπογαφήσας να λήξει ταυτόχ�ονα;  (Y/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4376,32 +4383,32 @@ msgstr ""
 "ανήκει π�άγματι στο π�οανφε�θέν άτομο; Εάν δεν ξέ�ετε τι να απαντήσετε "
 "πατήστε\"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Δεν απαντώ.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Δεν έχω ελέγξει καθόλου.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Έχω κάνει τον συνήθη έλεγχο.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:881
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Έχω κάνει εκτεταμένο έλεγχο.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:888
 #, fuzzy
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Η επιλογή σας; (πληκτ�ολογήστε ? για πλη�οφο�ίες): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4410,21 +4417,21 @@ msgstr ""
 "Σίγου�α θέλετε να υπογ�άψετε αυτό το κλειδί\n"
 "με το κλειδί σας: \""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Αυτή θα είναι μια ιδιο-υπογ�αφή.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: η υπογ�αφή δε θα σημειωθεί σαν μη-εξαγώγιμη.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 #, fuzzy
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
@@ -4432,14 +4439,14 @@ msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η υπογ�αφή δε θα σημειωθεί σαν μη-ανακαλέσιμη.\n"
 "\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:945
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 "\n"
 "Η υπογ�αφή θα σημειωθεί σαν μη-εξαγώγιμη.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:952
 #, fuzzy
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
@@ -4447,243 +4454,243 @@ msgstr ""
 "Η υπογ�αφή θα σημειωθεί σαν μη-ανακαλέσιμη.\n"
 "\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 #, fuzzy
 msgid "I have not checked this key at all.\n"
 msgstr ""
 "\n"
 "Δεν έχω ελέγξει καθόλου αυτό το κλειδί.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Έχω κάνει συνηθισμένο έλεγχο σε αυτό το κλειδί.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, fuzzy
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 "\n"
 "Έχω ελέγξει πολ� π�οσεκτικά αυτό το κλειδί.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:981
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Σίγου�α να υπογ�αφεί; "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "η υπογ�αφή απέτυχε: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "αποθήκευση και έξοδος"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "απεικόνιση του fingerprint"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Σημείωση υπογ�αφής: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "απεικόνιση των κλειδιών και των user ID"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "επιλογή user ID N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 #, fuzzy
 msgid "select subkey N"
 msgstr "επιλογή user ID N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 #, fuzzy
 msgid "check signatures"
 msgstr "ανάκληση υπογ�αφών"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "υπογ�αφή του κλειδιο� τοπικά"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Συμβουλή: Επιλέξτε το user ID για υπογ�αφή\n"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "add a user ID"
 msgstr "π�οσθήκη ενός user ID"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "π�οσθήκη ενός photo ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "διαγ�αφή ενός user ID"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "διαγ�αφή ενός δευτε�ε�οντος κλειδιο�"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "π�οσθήκη ενός κλειδιο� ανάκλησης"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Σίγου�α θέλετε να ανανεωθο�ν οι π�οεπιλογές για το επιλεγμένο user ID; "
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1314
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Δεν μπο�είτε να αλλάξετε την ημε�ομηνία λήξης σε ένα v3 κλειδί\n"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1316
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "σημείωση του user ID σαν π�ωτε�ων"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "απεικόνιση π�οεπιλογών (ειδικές)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "απεικόνιση επιλογών (αναλυτικά)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Σίγου�α θέλετε να ανανεωθο�ν οι π�οεπιλογές για το επιλεγμένο user ID; "
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1325
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "αδυναμία επεξε�γασίας του URI του διακομιση κλειδιών\n"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1327
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Σίγου�α θέλετε να ανανεωθο�ν οι π�οεπιλογές για το επιλεγμένο user ID; "
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1329
 msgid "change the passphrase"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "αλλαγή της εμπιστοσ�νης ιδιοκτήτη"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Σίγου�α θέλετε να ανακληθο�ν όλα τα επιλεγμένα user ID; "
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "ανάκληση ενός user ID"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "ανάκληση ενός δευτε�ε�οντος κλειδιο�"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 #, fuzzy
 msgid "enable key"
 msgstr "ενε�γοποιεί ένα κλειδί"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 #, fuzzy
 msgid "disable key"
 msgstr "απενε�γοποιεί ένα κλειδί"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "απεικόνιση photo ID"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1349
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1470
 msgid "Secret key is available.\n"
 msgstr "Το μυστικό κλειδί είναι διαθέσιμο.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 #, fuzzy
 #| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "Το μυστικό κλειδί είναι διαθέσιμο.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1574
 msgid "Need the secret key to do this.\n"
 msgstr "Απαιτείται το μυστικό κλειδί για να γίνει αυτό.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4691,310 +4698,294 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "Το κλειδί ανακλήθηκε."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 #, fuzzy
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Σίγου�α να υπογ�αφο�ν όλα τα user ID; "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1682
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Σίγου�α να υπογ�αφο�ν όλα τα user ID; "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1690
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Συμβουλή: Επιλέξτε το user ID για υπογ�αφή\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 msgid "You can't delete the last user ID!\n"
 msgstr "Δεν μπο�είτε να διαγ�άψετε το τελευταίο user ID!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1755
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Σίγου�α θέλετε να διαγ�αφο�ν όλα τα επιλεγμένα user ID; "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 #, 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:1814 g10/keyedit.c:1854
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Σίγου�α θέλετε να διαγ�αφεί αυτό το user ID; "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Π�έπει να επιλέξετε τουλάχιστον ένα κλειδί.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, fuzzy, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "αδυναμία π�όσβασης στο `%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, fuzzy, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "αδυναμία δημιου�γίας της κλειδοθήκης `%s': %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1969
 msgid "You must select at least one key.\n"
 msgstr "Π�έπει να επιλέξετε τουλάχιστον ένα κλειδί.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1975
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Σίγου�α θέλετε να διαγ�αφο�ν τα επιλεγμένα κλειδιά; "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Σίγου�α θέλετε να διαγ�αφεί αυτό το κλειδί; "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Σίγου�α θέλετε να ανακληθο�ν όλα τα επιλεγμένα user ID; "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Σίγου�α θέλετε να ανακληθεί αυτό το user ID; "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2034
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Σίγου�α θέλετε να ανακληθεί αυτό το κλειδί; "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2045
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Σίγου�α θέλετε να ανακληθο�ν τα επιλεγμένα κλειδιά; "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2047
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Σίγου�α θέλετε να ανακληθεί αυτό το κλειδί; "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2105
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2150
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "ο�ισμός απεικόνισης επιλογών"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Σίγου�α θέλετε να ανανεωθο�ν οι π�οεπιλογές για το επιλεγμένο user ID; "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2159
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Σίγου�α να ανανεωθο�ν οι π�οεπιλογές;"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Αποθήκευση των αλλαγών; "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Τε�ματισμός χω�ίς αποθήκευση; "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Το κλειδί δεν άλλαξε οπότε δεν χ�ειάζεται ενημέ�ωση.\n"
 
-#: g10/keyedit.c:2557
+#: g10/keyedit.c:2558
 #, 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:2583
+#: g10/keyedit.c:2584
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
 
-#: g10/keyedit.c:2677
+#: g10/keyedit.c:2717
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "μη έγκυ�η τιμή\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Δεν υπά�χει αυτό το user ID.\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Τίποτα για να υπογ�αφεί με το κλειδί  %08lX\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   υπογ�άφθηκε από %08lX στις %s%s\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "το κλειδί '%s' δε β�έθηκε: %s\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Πε�ίληψη: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Δυνατότητε: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 #, fuzzy
 msgid "Notations: "
 msgstr "Σημείωση: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Δεν υπά�χουν π�οεπιλογές σε ένα user ID τ�που PGP 2.x.\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3735
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Αυτό το κλειδί μπο�εί να ανακληθεί από %s κλειδί "
 
-#: g10/keyedit.c:3867
+#: g10/keyedit.c:3759
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Αυτό το κλειδί μπο�εί να ανακληθεί από %s κλειδί "
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3765
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (ευαίσθητο)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "αδυναμία δημιου�γίας του %s: %s\n"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[ανακλημένο]"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [λήγει: %s]"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [λήγει: %s]"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " εμπιστοσ�νη: %c/%c"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " εμπιστοσ�νη: %c/%c"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Αυτό το κλειδί έχει απενε�γοποιηθεί"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5002,19 +4993,19 @@ msgstr ""
 "Η εγγυ�ότητα του απεικονιζόμενου κλειδιο� δεν είναι απα�αίτητα σωστή\n"
 "εκτός και εάν επανακκινήσετε το π�όγ�αμμα.\n"
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5023,18 +5014,18 @@ msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έχει σημειωθεί ID χ�ήστη σαν π�ωτε�ων.  Αυτή η εντολή\n"
 "              μπο�εί να κάνει ένα άλλο ID χ�ήστη να γίνει το π�ωτε�ων.\n"
 
-#: g10/keyedit.c:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5043,35 +5034,35 @@ msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό έιναι ένα κλειδί τ�που PGP2. Η π�οσθήκη ενός photo ID\n"
 "               μπο�εί να κάνει με�ικές εκδόσεις PGP να το απο��ίψουν.\n"
 
-#: g10/keyedit.c:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Σίγου�α ακόμα θέλετε να το π�οσθέσετε; (y/N) "
 
-#: g10/keyedit.c:4324
+#: g10/keyedit.c:4216
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Δεν μπο�είτε να π�οσθέσετε μια photo ID σε ένα κλειδί τ�που PGP2.\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4231
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Διαγ�αφή αυτής της καλής υπογ�αφής; (y/N/q)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Διαγ�αφή αυτής της μη έγκυ�ης υπογ�αφής; (y/N/q)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Διαγ�αφή αυτής της άγνωστης υπογ�αφής; (y/N/q)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Σίγου�α να διαγ�αφεί αυτή η ιδιο-υπογ�αφή; (y/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5079,38 +5070,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Διαγ�άφτηκε %d υπογ�αφή.\n"
 msgstr[1] "Διαγ�άφτηκε %d υπογ�αφή.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Τίποτα δεν διαγ�άφτηκε.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 #, fuzzy
 msgid "invalid"
 msgstr "μη έγκυ�η θω�άκιση"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Το user ID \"%s\" ανακαλείτε."
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Το user ID \"%s\" ανακαλείτε."
 msgstr[1] "Το user ID \"%s\" ανακαλείτε."
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5120,40 +5111,40 @@ msgstr ""
 "               καθο�ισμένου ανακλητή μπο�εί να κάνει με�ικές εκδόσεις PGP\n"
 "               να το απο��ίψουν.\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Δεν μπο�είτε να π�οσθέσετε ένα καθο�ισμένο ανακλητή σε κλειδί τ�που PGP2.x.\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Πληκτ�ολογήστε το user ID του διο�ισμένου ανακλητή: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "αδυναμία ο�ισμο� ενός κλειδιο� τ�που PGP 2.x, σαν διο�ισμένου ανακλητή\n"
 
-#: g10/keyedit.c:4673
+#: g10/keyedit.c:4565
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "δε μπο�είτε να ο�ίσετε ένα κλειδί σαν το διο�ισμένο ανακλητή του εαυτο� του\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4587
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί έχει ανακληθεί από τον ο�ισμένο ανακλητή!\n"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4605
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: εάν ο�ίσετε ένα κλειδί σαν διο�ισμένο ανακλητή δεν μπο�εί να "
 "επανέλθει!\n"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4611
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5161,7 +5152,7 @@ msgstr ""
 "Είστε σίγου�οι ότι θέλετε να ο�ίσετε ένα κλειδί σαν διο�ισμένο ανακλητή; (y/"
 "N): "
 
-#: g10/keyedit.c:4788
+#: g10/keyedit.c:4680
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5170,184 +5161,184 @@ msgstr ""
 "Είστε σίγου�οι ότι θέλετε να ο�ίσετε ένα κλειδί σαν διο�ισμένο ανακλητή; (y/"
 "N): "
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Αλλαγή ημε�ομηνίας λήξης για ένα δευτε�ε�ον κλειδί.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Αλλαγή ημε�ομηνίας λήξης για ένα π�ωτε�ον κλειδί.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Δεν μπο�είτε να αλλάξετε την ημε�ομηνία λήξης σε ένα v3 κλειδί\n"
 
-#: g10/keyedit.c:4912
+#: g10/keyedit.c:4804
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Αλλαγή ημε�ομηνίας λήξης για ένα δευτε�ε�ον κλειδί.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Αλλαγή ημε�ομηνίας λήξης για ένα π�ωτε�ον κλειδί.\n"
 
-#: g10/keyedit.c:5033
+#: g10/keyedit.c:4925
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το υπογ�άφων υποκλειδί %08lX δεν έχει κατ' αντιπα�άσταση "
 "πιστοποιηθεί\n"
 
-#: g10/keyedit.c:5039
+#: g10/keyedit.c:4931
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Π�έπει να επιλέξετε ακ�ιβώς ένα user ID.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "πα�αλείφθηκε η v3 ιδιο-υπογ�αφή στο user id \"%s\"\n"
 
-#: g10/keyedit.c:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Σίγου�α θέλετε ακόμα να το χ�ησιμοποιήσετε; (y/N) "
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Σίγου�α θέλετε ακόμα να το χ�ησιμοποιήσετε; (y/N) "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Σημείωση υπογ�αφής: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Επικάλυψη (y/N); "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Δεν υπά�χει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Δεν υπά�χει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Δεν υπά�χει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Δεν υπά�χει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   υπογ�άφθηκε από %08lX στις %s%s%s\n"
 
-#: g10/keyedit.c:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (μη-εξαγώγιμο)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Αυτή η υπογ�αφή έληξε στις %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Σίγου�α θέλετε να ανακληθεί αυτό το κλειδί; "
 
-#: g10/keyedit.c:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Δημιου�γία ενός πιστοποιητικο� ανάκλησης για αυτή την υπογ�αφή; (y/N)"
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Έχετε υπογ�άψει αυτά τα user ID:\n"
 
-#: g10/keyedit.c:6167
+#: g10/keyedit.c:6061
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (μη-εξαγώγιμο)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ανακλήθηκε από %08lX στις %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Σκοπε�ετε να ανακαλέσετε αυτές τις υπογ�αφές:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Σίγου�α να δημιου�γηθο�ν τα πιστοποιητικά ανάκλησης; (y/N)"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "κανένα μυστικό κλειδί\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μια υπογ�αφή user ID έχει ημε�ομηνία %d δε�τε�α στο μέλλον\n"
 
-#: g10/keyedit.c:6426
+#: g10/keyedit.c:6320
 #, 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:6464
+#: g10/keyedit.c:6358
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, 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"
@@ -5387,53 +5378,53 @@ msgstr "πά�α πολλές `%c' π�οεπιλογές\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "μη έγκυ�ος χα�ακτή�ας στο \"κο�δόνι\" της επιλογής\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "εγγ�αφή άμεσης υπογ�αφής\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "εγγ�αφή ιδιο-υπογ�αφής\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "εγγ�αφή υπογ�αφής \"δέσιμου\" κλειδιο�\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "μη έγκυ�ο μέγεθος κλειδιο�, χ�ήση %u bits\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "στ�ογγυλοποίηση του μέγεθος κλειδιο� έως %u bits\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 #, fuzzy
 msgid "Encrypt"
 msgstr "κ�υπτογ�άφηση δεδομένων"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr ""
 
@@ -5447,179 +5438,179 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA και ElGamal (π�οκαθο�ισμένο)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA και ElGamal (π�οκαθο�ισμένο)\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (για υπογ�αφή μόνο)\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2113
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (για υπογ�αφή μόνο)\n"
 
-#: g10/keygen.c:2142
+#: g10/keygen.c:2119
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2127
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) RSA (υπογ�αφή και κ�υπτογ�άφηση)\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (π�οκαθο�ισμένο)"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (για υπογ�αφή μόνο)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/keygen.c:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) RSA (για κ�υπτογ�άφηση μόνο)\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Σημείωση υπογ�αφής: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Δεν υπά�χει user ID με δείκτη %d\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 sm/certreqgen-ui.c:234
 #, fuzzy, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: g10/keygen.c:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "απενε�γοποιεί ένα κλειδί"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, fuzzy, c-format
 #| msgid "rounded up to %u bits\n"
 msgid "rounded to %u bits\n"
 msgstr "στ�ογγυλοποιήθηκε έως τα %u bits\n"
 
-#: g10/keygen.c:2570
+#: g10/keygen.c:2547
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2555
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Τι μέγεθος κλειδιο� θα θέλατε; (1024) "
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Το μέγεθος κλειδιο� που ζητήθηκε είναι %u bits\n"
 
-#: g10/keygen.c:2641
+#: g10/keygen.c:2618
 #, 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:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5635,7 +5626,7 @@ msgstr ""
 "      <n>m = το κλειδί λήγει σε n μήνες\n"
 "      <n>y = το κλειδί λήγει σε n έτη\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5651,40 +5642,40 @@ msgstr ""
 "      <n>m = το κλειδί λήγει σε n μήνες\n"
 "      <n>y = το κλειδί λήγει σε n έτη\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Το κλειδί είναι έγκυ�ο για; (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Η υπογ�αφή έιναι έγκυ�η για; (0) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "μη έγκυ�η τιμή\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "το %s δεν λήγει ποτέ\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "το %s δεν λήγει ποτέ\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "το %s λήγει στις %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Υπογ�αφή λήγει στις %s.\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5692,12 +5683,12 @@ msgstr ""
 "Το σ�στημα σας δεν μπο�εί να απεικονίσει ημε�ομηνίες πέ�α του 2038.\n"
 "Όμως, θα χει�ίζονται σωστά έως το 2106.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Είναι αυτό σωστό (y/n); "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5708,7 +5699,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 #, fuzzy
 msgid ""
 "\n"
@@ -5725,42 +5716,42 @@ msgstr ""
 "    \"Nikolaoy Nikos (toy Ioanni) <nikoln@athens.gr>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Αληθινό Όνομα: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Μη έγκυ�ος χα�ακτή�ας στο όνομα\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "Διε�θυνση Email: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Μη έγκυ�η διε�θυνση Email\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Σχόλιο: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Μη έγκυ�ος χα�ακτή�ας στο σχόλιο\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, 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:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5771,11 +5762,11 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Πα�ακαλώ μην τοποθετείτε την διε�θυνση email στο όνομα ή στο σχόλιο\n"
 
-#: g10/keygen.c:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5790,35 +5781,35 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (Q)τε�ματισμός; "
 
-#: g10/keygen.c:3142
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Αλλαγή (N)όνομα, (C)σχόλιο, (E)mail ή (O)εντάξει/(Q)τε�ματισμός; "
 
-#: g10/keygen.c:3147
+#: g10/keygen.c:3124
 #, 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:3148
+#: g10/keygen.c:3125
 #, 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Πα�ακαλώ, διο�θώστε π�ώτα το σφάλμα\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5830,18 +5821,18 @@ msgstr ""
 "τους δίσκους) κατα τη διά�κεια υπολογισμο� π�ώτων α�ιθμών. Αυτό δίνει\n"
 "στη γεννήτ�ια τυχαίων α�ιθμών μια ευκαι�ία να μαζέψει α�κετή εντ�οπία.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Η δημιου�γία κλειδιο� απέτυχε: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5849,67 +5840,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' ήδη συμπιέστηκε\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Χ�ήση οπωσδήποτε αυτο� του κλειδιο�; "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Η δημιου�γία κλειδιο� αναβλήθηκε.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "αδυναμία δημιου�γίας του `%s': %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "ΣΗΜΕΙΩΣΗ: το μυστικό κλειδί %08lX έληξε στις %s\n"
 
-#: g10/keygen.c:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, fuzzy, c-format
 #| msgid "writing public key to `%s'\n"
 msgid "writing public key to '%s'\n"
 msgstr "εγγ�αφή του δημοσίου κλειδιο� στο `%s'\n"
 
-#: g10/keygen.c:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "δε β�έθηκε εγγ�άψιμη δημόσια κλειδοθήκη: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, 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:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "το δημόσιο και το μυστικό κλειδί δημιου�γήθηκαν και υπογ�άφηκαν.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5920,7 +5911,7 @@ msgstr ""
 "Μπο�είτε να χ�ησιμοποιήσετε την εντολή \"--edit-key\" για να δημιου�γηθεί\n"
 "ένα δευτε�ε�ον κλειδί για αυτό το λόγο.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5928,7 +5919,7 @@ msgstr ""
 "το κλειδί δημιου�γήθηκε %lu δευτε�όλεπτο στο μέλλον (χ�ονοδίνη ή\n"
 "απλώς π�όβλημα στο �ολόι)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5936,7 +5927,7 @@ msgstr ""
 "το κλειδί δημιου�γήθηκε %lu δευτε�όλεπτα στο μέλλον (χ�ονοδίνη ή\n"
 "απλώς π�όβλημα στο �ολόι)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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"
@@ -5944,17 +5935,17 @@ msgstr ""
 "ΣΗΜΕΙΩΣΗ: η δημιου�γία υποκλειδιών για κλειδιά v3 δεν είναι σ�μφωνο\n"
 "με το OpenPGP\n"
 
-#: g10/keygen.c:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Μυστικά τμήματα του κ��ιου κλειδιο� δεν είναι διαθέσιμα.\n"
 
-#: g10/keygen.c:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, fuzzy, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Μυστικά τμήματα του κ��ιου κλειδιο� δεν είναι διαθέσιμα.\n"
 
-#: g10/keygen.c:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Σίγου�α να δημιου�γηθεί; "
@@ -5963,27 +5954,43 @@ msgstr "Σίγου�α να δημιου�γηθεί; "
 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"
@@ -5991,7 +5998,7 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d κακές υπογ�αφές\n"
 msgstr[1] "%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"
@@ -5999,41 +6006,41 @@ msgid_plural "%d signatures not checked due to errors\n"
 msgstr[0] "1 υπογ�αφή δεν ελέγχθηκε λόγο ενός σφάλματος\n"
 msgstr[1] "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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Κλειδοθήκη"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Αποτ�πωμα π�ωτε�οντος κλειδιο�:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr " Αποτ�πωμα π�ωτ. κλειδιο�:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "      Αποτ�πωμα υποκλειδιο�:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Αποτ�πωμα κλειδιο� ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -6413,7 +6420,7 @@ msgstr "δυαδικό"
 msgid "textmode"
 msgstr "κατάσταση-κειμένου"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "άγνωστο"
 
@@ -6557,27 +6564,27 @@ msgstr "Ασυμπίεστο"
 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:1614
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "ανάγνωση επιλογών από `%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "άγνωστος π�οκαθο�ισμένος πα�αλήπτης `%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "άγνωστη κλάση υπογ�αφής"
@@ -6698,7 +6705,7 @@ msgid ""
 "%s"
 msgstr "%u-bit %s κλειδί, ID %08lX, δημιου�γία %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6712,73 +6719,73 @@ msgstr ""
 "χ�ησιμοποιείτε μια μεγάλη εικόνα το κλειδί σας αντίστοιχα θα γίνει μεγάλο!\n"
 "Ιδανίκό μέγεθος για μια εικόνα είναι αυτό κοντά στο 240x288.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Πληκτ�ολογήστε ένα όνομα α�χείου για το photo ID: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, fuzzy, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "αδυναμία π�όσβασης του α�χείου: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:239
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:241
 #, fuzzy
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Σίγου�α θέλετε ακόμα να το χ�ησιμοποιήσετε; (y/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:257
 #, fuzzy, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "\"%s\" δεν είναι JPEG α�χείο\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Είναι αυτή η φωτογ�αφία σωστή (y/N/q); "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "δεν υποστη�ίζετε η απομακ�υσμένη εκτέλεση π�ογ�άμματος\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:593
 #, fuzzy, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "αυτή η πλατφό�μα απαιτεί π�οσω�. α�χεία στην κλήση εξωτε�ικών π�ογ�αμμάτων\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "αφ�σικη έξοδος του εξωτε�ικο� π�ογ�άμματος\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "σφάλμα συστήματος κατά την κλήση εξωτε�ικο� π�ογ�άμματος: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:707
 #, 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:711
 #, 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:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6786,7 +6793,7 @@ msgstr ""
 "οι κλήσεις εξωτε�ικών π�ογ�αμμάτων απενε�γοποιήθηκαν λόγω ανασφαλών αδειών\n"
 "α�χείου\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "αδυναμία απεικόνισης του photo ID!\n"
@@ -7124,12 +7131,12 @@ msgstr "άγνωστος π�οκαθο�ισμένος πα�αλήπτης `%s
 msgid "no valid addressees\n"
 msgstr "καμμία έγκυ�η διε�θυνση\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "κλειδί %08lX: δεν υπά�χει αυτό το user ID\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "κλειδί %08lX: δεν υπά�χει αυτό το user ID\n"
@@ -8193,7 +8200,7 @@ msgstr ""
 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"
@@ -8223,14 +8230,14 @@ msgstr "πα�ακαλώ κάντε ένα --check-trustdb\n"
 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"
 msgstr[0] "%lu κλειδιά έχουν μέχ�ι τώ�α επεξε�γαστεί\n"
 msgstr[1] "%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"
@@ -8238,24 +8245,24 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d κλειδιά επεξε�γάστηκαν (%d μετ�ήσεις εγγυ�ότητας πέ�ασαν)\n"
 msgstr[1] "%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"
@@ -8384,7 +8391,7 @@ msgstr "ΧÏ�ήση: gpg [επιλογές] [αÏ�χεία] (-h για βοήθεÎ
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8392,7 +8399,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8428,7 +8435,7 @@ msgstr "αλλαγή της φ�άσης κλειδί"
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "Πα�ακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8514,75 +8521,75 @@ msgstr[1] "Η δημιου�γία κλειδιο� απέτυχε: %s\n"
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: scd/app-nks.c:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1654
+#: 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:1701
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2074
+#: scd/app-nks.c:2088
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: scd/app-nks.c:2082
+#: 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:2092
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2102
+#: 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:2104
+#: 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:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
@@ -8847,13 +8854,13 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8862,11 +8869,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:199 sm/certchain.c:2211
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -8890,241 +8897,241 @@ msgstr ""
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:818
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1260 sm/certchain.c:1264
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Αυτό το κλειδί έχει λήξει!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Αυτό το κλειδί έχει λήξει!"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Αυτό το κλειδί έχει λήξει!"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1404
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Αυτό το κλειδί έχει λήξει!"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "        νέες υπογ�αφές: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Πιστοποιητικό ανάκλησης δημιου�γήθηκε.\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "κακό πιστοποιητικό"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "απεικόνιση του fingerprint"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1505
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1511
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "δημιου�γία ενός πιστοποιητικο� ανάκλησης"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "επαλήθευση μιας υπογ�αφής"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1911 dirmngr/validate.c:693
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "η π�οεπιλογή %c%lu αντιγ�άφτηκε\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Πιστοποιητικό ανάκλησης δημιου�γήθηκε.\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "κακό πιστοποιητικό"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9147,7 +9154,7 @@ msgstr "μη επεξε�γασμένο"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "όχι|οχι"
@@ -9184,42 +9191,42 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s κλειδί, ID %08lX, δημιου�γία %s%s\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "κακό πιστοποιητικό"
@@ -9778,7 +9785,7 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Υπογ�αφή έγινε στο %.*s με χ�ήση του κλειδιο�%s ID %08lX\n"
@@ -9972,7 +9979,7 @@ msgstr "διαγ�αφή block κλειδιών απέτυχε: %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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@ -10224,166 +10231,166 @@ msgstr "μη έγκυ�ος αλγό�ιθμος  hash `%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1849 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:1923
 #, 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:1938
 #, fuzzy, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1945
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1984
 #, fuzzy, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "εγγ�αφή στο  `%s'\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2011
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "δημιου�γία ενός πιστοποιητικο� ανάκλησης"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, fuzzy, c-format
 #| msgid "signature verification suppressed\n"
 msgid "CRL signature verification failed: %s\n"
 msgstr "καταστολή ανάκλησης υπογ�αφής\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2084
 #, fuzzy, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2226
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2233
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "η ενημέ�ωση απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2267
 #, fuzzy, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "αδυναμία δημιου�γίας καταλόγου `%s': %s\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2271
 #, fuzzy, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "αδυναμία δημιου�γίας καταλόγου `%s': %s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2281
 #, fuzzy, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2291
 #, 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:2301
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "εγγ�αφή στο  `%s'\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2308
 #, fuzzy, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2333
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2414
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2460
 #, 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:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 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:2523
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
@@ -10391,36 +10398,36 @@ msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη έγκυ�ο μέγεθος α�χείου random_seed - δεν\n"
 "χ�ησιμοποιείτε\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2558
 #, fuzzy, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "%s: σφάλμα στην ανάγνωση της εγγ�αφής free : %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2569
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? π�όβλημα στον έλεγχο ανάκλησης: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2600
 #, fuzzy, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2603
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "η ενημέ�ωση απέτυχε: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
@@ -10782,12 +10789,12 @@ msgstr "χ�ήση: gpg [επιλογές] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "το %s δεν επιτ�έπεται με το %s!\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
@@ -11035,93 +11042,93 @@ msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημ
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:582
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/ocsp.c:598 dirmngr/ocsp.c:782
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, fuzzy, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/ocsp.c:642
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "το κλειδί '%s' δε β�έθηκε: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:698
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "δημιου�γία ενός πιστοποιητικο� ανάκλησης"
 
-#: dirmngr/ocsp.c:708
+#: dirmngr/ocsp.c:720
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: dirmngr/ocsp.c:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:753
+#: 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:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:765
+#: dirmngr/ocsp.c:777
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using OCSP responder '%s'\n"
 msgstr "χ�ήση του κ�υπταλγό�ιθμου: %s\n"
 
-#: dirmngr/ocsp.c:822
+#: dirmngr/ocsp.c:834
 #, fuzzy, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: dirmngr/ocsp.c:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:854
+#: dirmngr/ocsp.c:894
 #, fuzzy, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "ΣΗΜΕΙΩΣΗ: το κλειδί έχει ανακληθεί"
 
-#: dirmngr/ocsp.c:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11135,64 +11142,64 @@ msgstr "η υπογ�αφή απέτυχε: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "η υπογ�αφή απέτυχε: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1776
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "αδυναμία δημιου�γίας του `%s': %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: αδυναμία δημιου�γίας hashtable: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, 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:3062
+#: dirmngr/server.c:3078
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
 
-#: dirmngr/server.c:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11511,87 +11518,101 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: tools/gpg-card.c:2428
 #, fuzzy, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "πα�αλείφθηκε: μυστικό κλειδί ήδη πα�ών\n"
 
-#: tools/gpg-card.c:2427
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Πιστοποιητικό ανάκλησης δημιου�γήθηκε.\n"
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: tools/gpg-card.c:3762
 #, fuzzy
 #| msgid "|NAME|use NAME as default recipient"
 msgid "setup KDF for PIN authentication"
 msgstr "|Ο�ΟΜΑ|χ�ήση του Ο�ΟΜΑτος ως π�οκαθο�ισμένου πα�αλήπτη"
 
-#: tools/gpg-card.c:3706
+#: tools/gpg-card.c:3764
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "αλλαγή της ημε�ομηνίας λήξης"
 
-#: tools/gpg-card.c:3707
+#: tools/gpg-card.c:3765
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Πιστοποιητικό ανάκλησης δημιου�γήθηκε.\n"
 
-#: tools/gpg-card.c:3708
+#: tools/gpg-card.c:3766
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Πιστοποιητικό ανάκλησης δημιου�γήθηκε.\n"
 
-#: tools/gpg-card.c:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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"
@@ -13227,9 +13248,6 @@ msgstr ""
 #~ msgid "delete signatures"
 #~ msgstr "διαγ�αφή υπογ�αφών"
 
-#~ msgid "set preference list"
-#~ msgstr "ο�ισμός απεικόνισης επιλογών"
-
 #~ msgid "updated preferences"
 #~ msgstr "αναωεωμένες επιλογές"
 
diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo
index c0d3fdc..d342054 100644
--- a/po/en@boldquot.gmo
+++ b/po/en@boldquot.gmo
diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index daa812b..9e8b1bb 100644
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -30,10 +30,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.3.8\n"
+"Project-Id-Version: GNU gnupg 2.4.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
-"PO-Revision-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
+"PO-Revision-Date: 2022-12-16 17:50+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en\n"
@@ -165,8 +165,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "does not match - try again"
 
@@ -215,17 +215,17 @@ msgstr "Note: Request from the web browser."
 msgid "Note: Request from a remote site."
 msgstr "Note: Request from a remote site."
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "error getting serial number of card: %s\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Please re-enter this passphrase"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -234,7 +234,7 @@ msgstr ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -247,25 +247,25 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "can't open '%s': %s\n"
@@ -275,12 +275,12 @@ msgstr "can't open '%s': %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "no suitable card key found: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "error getting list of cards: %s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -289,20 +289,20 @@ msgstr ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Allow"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Deny"
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -311,7 +311,7 @@ msgstr ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 
-#: agent/command-ssh.c:3797
+#: agent/command-ssh.c:3837
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "failed to create stream from socket: %s\n"
@@ -435,205 +435,209 @@ msgstr "Please enter the passphrase to%0Aprotect your new key"
 msgid "Please enter the new passphrase"
 msgstr "Please enter the new passphrase"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr "Options used for startup"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr "run in daemon mode (background)"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr "run in server mode (foreground)"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "do not detach from the console"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr "sh-style command output"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr "csh-style command output"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|read options from FILE"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr "Options controlling the diagnostic output"
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "verbose"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "be somewhat more quiet"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|write server mode logs to FILE"
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr "Options controlling the configuration"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 msgid "do not use the SCdaemon"
 msgstr "do not use the SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|use PGM as the SCdaemon program"
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|use PGM as the tpm2daemon program"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|accept some commands via NAME"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr "ignore requests to change the TTY"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr "ignore requests to change the X display"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 msgid "enable ssh support"
 msgstr "enable ssh support"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|use ALGO to show ssh fingerprints"
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 msgid "enable putty support"
 msgstr "enable putty support"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+msgid "enable Win32-OpenSSH support"
+msgstr "enable Win32-OpenSSH support"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "Options controlling the security"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|expire cached PINs after N seconds"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|expire SSH keys after N seconds"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|set maximum PIN cache lifetime to N seconds"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|set maximum SSH key lifetime to N seconds"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr "do not use the PIN cache when signing"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 msgid "disallow the use of an external password cache"
 msgstr "disallow the use of an external password cache"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "disallow clients to mark keys as “trusted�"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 msgid "allow presetting passphrase"
 msgstr "allow presetting passphrase"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr "Options enforcing a passphrase policy"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr "do not allow bypassing the passphrase policy"
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 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:271
+#: agent/gpg-agent.c:279
 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:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|check new passphrases against pattern in FILE"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|expire the passphrase after N days"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 msgid "do not allow the reuse of old passphrases"
 msgstr "do not allow the reuse of old passphrases"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr "Options controlling the PIN-Entry"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 msgid "never use the PIN-entry"
 msgstr "never use the PIN-entry"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr "disallow caller to override the pinentry"
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "let PIN-Entry grab keyboard and mouse"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|use PGM as the PIN-Entry program"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|set the Pinentry timeout to N seconds"
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: 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:570
+#: agent/gpg-agent.c:582
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -641,135 +645,135 @@ msgstr ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "invalid debug-level ‘%s’ given\n"
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "reading options from ‘%s’\n"
 
-#: agent/gpg-agent.c:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: “%s� is a deprecated option\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "can't create socket: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket name ‘%s’ is too long\n"
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "trying to steal socket from running %s\n"
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error getting nonce for the socket\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error binding socket to '%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "can't set permissions of '%s': %s\n"
 
-#: agent/gpg-agent.c:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "listening on socket ‘%s’\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "can't create directory '%s': %s\n"
 
-#: agent/gpg-agent.c:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "directory ‘%s’ created\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() failed for '%s': %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "can't use ‘%s’ as home directory\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error reading nonce on fd %d: %s\n"
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "handler 0x%lx for fd %d started\n"
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "handler 0x%lx for fd %d terminated\n"
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, 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:2853
+#: agent/gpg-agent.c:2967
 #, 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:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect failed: %s - waiting 1s\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stopped\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1038,7 +1042,7 @@ msgstr "checking created signature failed: %s\n"
 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:1602
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "public key algorithm %d (%s) is not supported\n"
@@ -1053,52 +1057,52 @@ msgstr "protection algorithm %d (%s) is not supported\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1128,18 +1132,18 @@ msgstr "Warning: unsafe ownership on %s “%s�\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Warning: unsafe permissions on %s “%s�\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "waiting for file ‘%s’ to become accessible ...\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "yes"
 
@@ -1193,8 +1197,8 @@ msgstr "out of core in secure memory while allocating %lu bytes"
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1214,67 +1218,67 @@ msgstr "WARNING: “%s%s� is an obsolete option - it has no effect\n"
 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:432 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"
@@ -1422,11 +1426,11 @@ msgstr "Certificate chain valid"
 msgid "Root certificate trustworthy"
 msgstr "Root certificate trustworthy"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 msgid "no CRL found for certificate"
 msgstr "no CRL found for certificate"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 msgid "the available CRL is too old"
 msgstr "the available CRL is too old"
 
@@ -1463,7 +1467,7 @@ msgstr "No help available for '%s'."
 msgid "ignoring garbage line"
 msgstr "ignoring garbage line"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "[none]"
 msgstr "[none]"
 
@@ -1507,36 +1511,36 @@ msgstr "iconv_open failed: %s\n"
 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
 #, 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"
@@ -1546,104 +1550,104 @@ msgstr "waiting for lock %s...\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s is too old (need %s, have %s)\n"
 
-#: g10/armor.c:441
+#: 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:1462
+#: g10/build-packet.c:1480
 #, c-format
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "[ not human readable (%zu bytes: %s%s) ]"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1652,32 +1656,32 @@ msgstr ""
 "a notation name must have only printable characters or spaces, and end with "
 "an ‘=’\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, 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:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, 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:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNING: invalid notation data found\n"
@@ -1691,7 +1695,7 @@ msgstr "failed to proxy %s inquiry to client\n"
 msgid "Enter passphrase: "
 msgstr "Enter passphrase: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 g10/sign.c:473
 #: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
@@ -1708,7 +1712,7 @@ msgstr "error from TPM: %s\n"
 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:2330
+#: 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"
@@ -1747,169 +1751,169 @@ msgstr "unacceptable HTTP redirect from server was cleaned up"
 msgid "server uses an invalid certificate"
 msgstr "server uses an invalid certificate"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "Mr."
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "Ms."
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "forced"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 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:1500
+#: g10/card-util.c:803 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:1502
+#: g10/card-util.c:805 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:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Cardholder's surname: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Cardholder's given name: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Login data (account name): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Private DO data: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Language preferences: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 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:1800
+#: g10/card-util.c:1199 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Error: invalid response.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 msgid "not an OpenPGP card"
 msgstr "not an OpenPGP card"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr "Replace existing key? (y/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -1921,99 +1925,99 @@ msgstr ""
 "      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:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr "Changing card key attribute for: "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 msgid "Signature key\n"
 msgstr "Signature key\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 msgid "Encryption key\n"
 msgstr "Encryption key\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr "Authentication key\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Invalid selection.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 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:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2024,176 +2028,176 @@ msgstr ""
 "   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:1741
 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:1743 g10/card-util.c:1833
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signature key\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1744 g10/card-util.c:1835
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Encryption key\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentication key\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 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:1876
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD failed: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 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:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "quit this menu"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr "show admin commands"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "show this help"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "list all available data"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3687
+#: g10/card-util.c:2260 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:3688
+#: g10/card-util.c:2261 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:3689
+#: g10/card-util.c:2262 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:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "change the login name"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "change the language preferences"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 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:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "change a CA fingerprint"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 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:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "generate new keys"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 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:3698
+#: g10/card-util.c:2271 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:3699
+#: g10/card-util.c:2272 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:3703
+#: g10/card-util.c:2273 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:2275
 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:2276
 msgid "change the key attribute"
 msgstr "change the key attribute"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 msgid "Admin-only command\n"
 msgstr "Admin-only command\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr "Admin commands are allowed\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output doesn't work for this command\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 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 +2255,9 @@ msgstr "key"
 msgid "subkey"
 msgstr "subkey"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "update failed: %s\n"
@@ -2285,18 +2289,18 @@ msgid ""
 msgstr ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr "(use option “%s� to override)\n"
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, 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"
@@ -2306,43 +2310,43 @@ msgstr "cipher algorithm ‘%s’ may not be used in %s mode\n"
 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:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creating passphrase: %s\n"
 
-#: g10/encrypt.c:481
+#: g10/encrypt.c:473
 #, 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:512
+#: g10/encrypt.c:503
 #, c-format
 msgid "using cipher %s.%s\n"
 msgstr "using cipher %s.%s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "‘%s’ already compressed\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "WARNING: ‘%s’ is an empty file\n"
 
-#: g10/encrypt.c:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, 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:862
+#: g10/encrypt.c:853
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "reading from ‘%s’\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2351,12 +2355,12 @@ msgstr ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, c-format
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s.%s encrypted for: “%s�\n"
 
-#: g10/encrypt.c:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "option ‘%s’ may not be used in %s mode\n"
@@ -2383,61 +2387,69 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "WARNING: nothing exported\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2501,7 +2513,7 @@ msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "using subkey %s instead of primary key %s\n"
 
-#: g10/getkey.c:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "valid values for option '%s':\n"
@@ -2574,111 +2586,111 @@ msgstr "quickly revoke a user-id"
 msgid "quickly set a new expiration date"
 msgstr "quickly set a new expiration date"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr "full featured key pair generation"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "generate a revocation certificate"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "remove keys from the public keyring"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "remove keys from the secret keyring"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "quickly sign a key"
 msgstr "quickly sign a key"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 msgid "quickly sign a key locally"
 msgstr "quickly sign a key locally"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "quickly revoke a key signature"
 msgstr "quickly revoke a key signature"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "sign a key"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "sign a key locally"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "sign or edit a key"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "change a passphrase"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "export keys"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "export keys to a keyserver"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "import keys from a keyserver"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "search for keys on a keyserver"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "update all keys from a keyserver"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "import/merge keys"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr "print the card status"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr "change data on a card"
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr "change a card's PIN"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "update the trust database"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 msgid "print message digests"
 msgstr "print message digests"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "run in server mode"
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|set the TOFU policy for a key"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|use NAME as default secret key"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|encrypt to user ID NAME as well"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|set up email aliases"
 
@@ -2694,51 +2706,51 @@ msgstr "do not make any changes"
 msgid "prompt before overwriting"
 msgstr "prompt before overwriting"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr "Options controlling the input"
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr "Options controlling the output"
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "create ascii armored output"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|write output to FILE"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "use canonical text mode"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set compress level to N (0 disables)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr "Options controlling key import and export"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 msgid "import missing key from a signature"
 msgstr "import missing key from a signature"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 msgid "include the public key in signatures"
 msgstr "include the public key in signatures"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "disable all access to the dirmngr"
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr "Options controlling key listings"
 
@@ -2762,7 +2774,7 @@ msgstr "Options for unattended use"
 msgid "Other options"
 msgstr "Other options"
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2770,7 +2782,7 @@ msgstr ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2790,11 +2802,11 @@ msgstr ""
 " --list-keys [names]        show keys\n"
 " --fingerprint [names]      show fingerprints\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Usage: @GPG@ [options] [files] (-h for help)"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1172
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2804,7 +2816,7 @@ msgstr ""
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2812,73 +2824,73 @@ msgstr ""
 "\n"
 "Supported algorithms:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "usage: %s [options] %s\n"
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = sign found in group definition ‘%s’\n"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1698
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, 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:1735
+#: g10/gpg.c:1725
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2886,19 +2898,19 @@ msgstr ""
 "WARNING: unsafe enclosing directory ownership on configuration file ‘"
 "%s’\n"
 
-#: g10/gpg.c:1738
+#: g10/gpg.c:1728
 #, 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:1744
+#: g10/gpg.c:1734
 #, 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:1747
+#: g10/gpg.c:1737
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2906,468 +2918,457 @@ msgstr ""
 "WARNING: unsafe enclosing directory permissions on configuration file ‘"
 "%s’\n"
 
-#: g10/gpg.c:1750
+#: g10/gpg.c:1740
 #, 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:1966
+#: g10/gpg.c:1956
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "unknown configuration item ‘%s’\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr "display photo IDs during key listings"
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 msgid "show key usage information during key listings"
 msgstr "show key usage information during key listings"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr "show policy URLs during signature listings"
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 msgid "show all notations during signature listings"
 msgstr "show all notations during signature listings"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr "show IETF standard notations during signature listings"
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr "show user-supplied notations during signature listings"
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "show preferred keyserver URLs during signature listings"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr "show user ID validity during key listings"
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr "show revoked and expired user IDs in key listings"
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr "show revoked and expired subkeys in key listings"
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 msgid "show the keyring name in key listings"
 msgstr "show the keyring name in key listings"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 msgid "show expiration dates during signature listings"
 msgstr "show expiration dates during signature listings"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+msgid "show preferences"
+msgstr "show preferences"
+
+#: g10/gpg.c:2197
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "unknown TOFU policy ‘%s’\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(use “help� to list choices)\n"
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Note: %s is not for normal use!\n"
 
-#: g10/gpg.c:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’ is not a valid signature expiration\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s� is not a proper mail address\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "invalid pinentry mode ‘%s’\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "invalid request origin ‘%s’\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’ is not a valid character set\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "could not parse keyserver URL\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: invalid keyserver options\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "invalid keyserver options\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "invalid filter option: %s\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr "display photo IDs during signature verification"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr "show policy URLs during signature verification"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 msgid "show all notations during signature verification"
 msgstr "show all notations during signature verification"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr "show IETF standard notations during signature verification"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr "show user-supplied notations during signature verification"
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "show preferred keyserver URLs during signature verification"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 msgid "show user ID validity during signature verification"
 msgstr "show user ID validity during signature verification"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "show revoked and expired user IDs in signature verification"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 msgid "show only the primary user ID in signature verification"
 msgstr "show only the primary user ID in signature verification"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "invalid argument for option “%.50s�\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNING: running with faked system time: "
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, 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:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/gpg.c:3952
-#, c-format
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "selected AEAD algorithm is invalid\n"
-
-#: g10/gpg.c:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/gpg.c:4015
-#, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr "invalid personal AEAD preferences\n"
-
-#: g10/gpg.c:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "chunk size invalid - using %d\n"
 
-#: g10/gpg.c:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, 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:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, 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:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export as ssh key failed: %s\n"
 
-#: g10/gpg.c:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "invalid hash algorithm ‘%s’\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, 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:5366
+#: g10/gpg.c:5322
 #, 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:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "the given preferred keyserver URL is invalid\n"
@@ -3380,7 +3381,7 @@ msgstr "|FILE|take the keys from the keyring FILE"
 msgid "make timestamp conflicts only a warning"
 msgstr "make timestamp conflicts only a warning"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 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"
 
@@ -3409,153 +3410,153 @@ msgstr "No help available"
 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"
@@ -3564,172 +3565,172 @@ msgstr ""
 "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:1998 g10/import.c:3146
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "key %s: no user ID\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, c-format
 msgid "key %s: %s\n"
 msgstr "key %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr "rejected by import screener"
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "key %s: new key - skipped\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "error writing keyring '%s': %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "key %s: secret key imported\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, 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:2801
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "key %s: error sending to agent: %s\n"
@@ -3742,197 +3743,197 @@ msgstr "key %s: error sending to agent: %s\n"
 #. * 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:2970
 #, 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:3117
 #, 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:3138 g10/import.c:3177
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "importing secret keys not allowed\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "reason for revocation: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "revocation comment: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "key %s: invalid subkey binding\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3788
 #, 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:3812
 #, 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:3825
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "key %s: invalid subkey revocation\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3840
 #, 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:3887
 #, 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:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "key %s: skipped subkey\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "key %s: direct key signature added\n"
@@ -3971,14 +3972,14 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "%d duplicate signature removed\n"
 msgstr[1] "%d duplicate signatures removed\n"
 
-#: g10/key-check.c:726 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"
 msgstr[0] "%d signature not checked due to a missing key\n"
 msgstr[1] "%d signatures not checked due to missing keys\n"
 
-#: g10/key-check.c:734 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"
@@ -4031,15 +4032,15 @@ msgstr "keyblock resource '%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "failed to rebuild keyring cache: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[revocation]"
 msgstr "[revocation]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4051,17 +4052,17 @@ msgstr ""
 "(by looking at passports, checking fingerprints from different sources, "
 "etc.)\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 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:390 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:408
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4071,50 +4072,50 @@ msgstr ""
 "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:425
 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:553
 #, 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:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  Unable to sign.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID “%s� is expired."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, 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:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User ID “%s� is signable.  "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr "Sign it? (y/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4123,11 +4124,11 @@ msgstr ""
 "The self-signature on “%s�\n"
 "is a PGP 2.x-style signature.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4136,12 +4137,12 @@ msgstr ""
 "Your current signature on “%s�\n"
 "has expired.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4150,43 +4151,43 @@ msgstr ""
 "Your current signature on “%s�\n"
 "is a local signature.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "This key has expired!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4197,31 +4198,31 @@ msgstr ""
 "to the person named above?  If you don't know what to answer, enter "
 "“0�.\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, 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:876
 #, 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:878
 #, 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:881
 #, 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:888
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Your selection? (enter ‘?’ for more information): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4230,226 +4231,226 @@ msgstr ""
 "Are you sure that you want to sign this key with your\n"
 "key “%s� (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 msgid "This will be a self-signature.\n"
 msgstr "This will be a self-signature.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 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:935
 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:945
 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:952
 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:959
 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:964
 msgid "I have checked this key casually.\n"
 msgstr "I have checked this key casually.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 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:981
 msgid "Really sign? (y/N) "
 msgstr "Really sign? (y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signing failed: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 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:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "save and quit"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 msgid "show key fingerprint"
 msgstr "show key fingerprint"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "show the keygrip"
 msgstr "show the keygrip"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "list key and user IDs"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "select user ID N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr "select subkey N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr "check signatures"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 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:1286
 msgid "sign selected user IDs locally"
 msgstr "sign selected user IDs locally"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 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:1289
 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:1291
 msgid "add a user ID"
 msgstr "add a user ID"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "add a photo ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr "delete selected user IDs"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr "add a subkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr "add a key to a smartcard"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr "move a key to a smartcard"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 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:1306
 msgid "move a backup key to a smartcard"
 msgstr "move a backup key to a smartcard"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 msgid "delete selected subkeys"
 msgstr "delete selected subkeys"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "add a revocation key"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 msgid "delete signatures from the selected user IDs"
 msgstr "delete signatures from the selected user IDs"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1314
 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:1316
 msgid "flag the selected user ID as primary"
 msgstr "flag the selected user ID as primary"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "list preferences (expert)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "list preferences (verbose)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 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:1325
 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:1327
 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:1329
 msgid "change the passphrase"
 msgstr "change the passphrase"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "change the ownertrust"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 msgid "revoke signatures on the selected user IDs"
 msgstr "revoke signatures on the selected user IDs"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 msgid "revoke selected user IDs"
 msgstr "revoke selected user IDs"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "revoke key or selected subkeys"
 msgstr "revoke key or selected subkeys"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "enable key"
 msgstr "enable key"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr "disable key"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr "show selected photo IDs"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 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:1349
 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:1470
 msgid "Secret key is available.\n"
 msgstr "Secret key is available.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 msgid "Secret subkeys are available.\n"
 msgstr "Secret subkeys are available.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1574
 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:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4462,284 +4463,268 @@ msgstr ""
 "signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "Key is revoked."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 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:1682
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Really sign all user IDs? (y/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1690
 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:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Use the ‘%s’ command.)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 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:1756
 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:1814 g10/keyedit.c:1854
 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 msgid "You must select exactly one key.\n"
 msgstr "You must select exactly one key.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 msgid "Command expects a filename argument\n"
 msgstr "Command expects a filename argument\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "Can't open '%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, 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:1969
 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:1975
 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:1977
 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:2015
 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:2016
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Really revoke this user ID? (y/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2034
 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:2045
 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:2047
 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:2105
 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:2150
 msgid "Set preference list to:\n"
 msgstr "Set preference list to:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 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:2159
 msgid "Really update the preferences? (y/N) "
 msgstr "Really update the preferences? (y/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Save changes? (y/N) "
 msgstr "Save changes? (y/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr "Quit without saving? (y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Key not changed so no update needed.\n"
 
-#: g10/keyedit.c:2557
+#: g10/keyedit.c:2558
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2584
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "revoking the user ID failed: %s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "setting the primary user ID failed: %s\n"
 
-#: g10/keyedit.c:2677
+#: g10/keyedit.c:2717
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "“%s� is not a fingerprint\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "“%s� is not the primary fingerprint\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Invalid user ID '%s': %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "No matching user IDs."
 msgstr "No matching user IDs."
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "Nothing to sign.\n"
 msgstr "Nothing to sign.\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Not signed by you.\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "revoking the key signature failed: %s\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3251
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "‘%s’ is not a valid expiration time\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "“%s� is not a proper fingerprint\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "subkey “%s� not found\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr "AEAD: "
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Digest: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Features: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr "Keyserver no-modify"
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Preferred keyserver: "
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr "Notations: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr "(sensitive)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "created: %s"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr "revoked: %s"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr "expired: %s"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "expires: %s"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr "usage: %s"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr "card-no: "
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr "trust: %s"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr "validity: %s"
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "This key has been disabled"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4747,17 +4732,17 @@ msgstr ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "expired"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4766,17 +4751,17 @@ msgstr ""
 "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:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "WARNING: Your encryption subkey expires soon.\n"
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4786,72 +4771,72 @@ msgstr ""
 "versions\n"
 "         of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 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:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 msgid "Such a user ID already exists on this key!"
 msgstr "Such a user ID already exists on this key!"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Delete this good signature? (y/N/q)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Delete this invalid signature? (y/N/q)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Delete this unknown signature? (y/N/q)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Really delete this self-signature? (y/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Deleted %d signature.\n"
 msgstr[1] "Deleted %d signatures.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Nothing deleted.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "invalid"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID “%s� compacted: %s\n"
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "User ID “%s�: %d signature removed\n"
 msgstr[1] "User ID “%s�: %d signatures removed\n"
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID “%s�: already minimized\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID “%s�: already clean\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4861,40 +4846,40 @@ msgstr ""
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Enter the user ID of the designated revoker: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 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:4719
+#: g10/keyedit.c:4611
 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:4788
+#: g10/keyedit.c:4680
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -4902,171 +4887,171 @@ msgstr ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changing expiration time for a subkey.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changing expiration time for the primary key.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 msgid "Changing usage of a subkey.\n"
 msgstr "Changing usage of a subkey.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 msgid "Changing usage of the primary key.\n"
 msgstr "Changing usage of the primary key.\n"
 
-#: g10/keyedit.c:5033
+#: g10/keyedit.c:4925
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signing subkey %s is already cross-certified\n"
 
-#: g10/keyedit.c:5039
+#: g10/keyedit.c:4931
 #, 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:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Please select exactly one user ID.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, 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:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr "Enter your preferred keyserver URL: "
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 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:5451
+#: g10/keyedit.c:5345
 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:5516
+#: g10/keyedit.c:5410
 msgid "Enter the notation: "
 msgstr "Enter the notation: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 msgid "Proceed? (y/N) "
 msgstr "Proceed? (y/N) "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No user ID with index %d\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No user ID with hash %s\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No subkey with key ID '%s'.\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No subkey with index %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: “%s�\n"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "This signature expired on %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 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:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Create a revocation certificate for this signature? (y/N) "
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr " (non-revocable)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revoked by your key %s on %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "You are about to revoke these signatures:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Really create the revocation certificates? (y/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "no secret key\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, 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:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "user ID “%s� is already revoked\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Key %s is already revoked.\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subkey %s is already revoked.\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, 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"
@@ -5106,52 +5091,52 @@ msgstr "too many AEAD preferences\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "invalid item ‘%s’ in preference string\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "writing self signature\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "writing key binding signature\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize invalid; using %u bits\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize rounded up to %u bits\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, 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:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr "Certify"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr "Authenticate"
 
@@ -5165,166 +5150,166 @@ msgstr "Authenticate"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "Possible actions for this %s key: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr "Current allowed actions: "
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Toggle the sign capability\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Toggle the encrypt capability\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Toggle the authenticate capability\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Finished\n"
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA and RSA%s\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA and Elgamal%s\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, c-format
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (sign only)%s\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2113
 #, c-format
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (sign only)%s\n"
 
-#: g10/keygen.c:2142
+#: g10/keygen.c:2119
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (encrypt only)%s\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, c-format
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (encrypt only)%s\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2127
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (set your own capabilities)%s\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (set your own capabilities)%s\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ECC (sign and encrypt)%s\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 msgid " *default*"
 msgstr " *default*"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (sign only)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) ECC (set your own capabilities)%s\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, c-format
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC (encrypt only)%s\n"
 
-#: g10/keygen.c:2167
+#: g10/keygen.c:2144
 #, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) Existing key%s\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "  (%d) Existing key from card%s\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Enter the keygrip: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "No key with this keygrip\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 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:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Available keys:\n"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "rounded to %u bits\n"
 
-#: g10/keygen.c:2570
+#: g10/keygen.c:2547
 #, 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:2578
+#: g10/keygen.c:2555
 #, 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:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Requested keysize is %u bits\n"
 
-#: g10/keygen.c:2641
+#: g10/keygen.c:2618
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Please select which elliptic curve you want:\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5340,7 +5325,7 @@ msgstr ""
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5356,38 +5341,38 @@ msgstr ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Key is valid for? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature is valid for? (%s) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "invalid value\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr "Key does not expire at all\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr "Signature does not expire at all\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key expires at %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature expires at %s\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5395,11 +5380,11 @@ msgstr ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr "Is this correct? (y/N) "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5413,7 +5398,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5429,41 +5414,41 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>�\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Real name: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Invalid character in name\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, 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:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "Email address: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Not a valid email address\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Comment: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Invalid character in comment\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "You are using the ‘%s’ character set.\n"
 
-#: g10/keygen.c:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5474,11 +5459,11 @@ msgstr ""
 "    “%s�\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Such a user ID already exists on this key!\n"
 
@@ -5493,31 +5478,31 @@ msgstr "Such a user ID already exists on this key!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Change (N)ame, (E)mail, or (Q)uit? "
 
-#: g10/keygen.c:3148
+#: g10/keygen.c:3125
 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Please correct the error first\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5529,18 +5514,18 @@ msgstr ""
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, 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:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Key generation failed: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5551,64 +5536,64 @@ msgstr ""
 "    “%s�\n"
 "\n"
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr "Continue? (Y/n) "
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "A key for “%s� already exists\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 msgid "Create anyway? (y/N) "
 msgstr "Create anyway? (y/N) "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, c-format
 msgid "creating anyway\n"
 msgstr "creating anyway\n"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, 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:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Key generation canceled.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "can't create backup file '%s': %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "writing public key to ‘%s’\n"
 
-#: g10/keygen.c:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no writable public keyring found: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "error writing public keyring '%s': %s\n"
 
-#: g10/keygen.c:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "public and secret key created and signed.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 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"
@@ -5616,36 +5601,36 @@ msgstr ""
 "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:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, 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:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, 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:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr "Really create? (y/N) "
 
@@ -5653,74 +5638,90 @@ msgstr "Really create? (y/N) "
 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"
 msgstr[0] "%d good signature\n"
 msgstr[1] "%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"
 msgstr[0] "%d signature not checked due to an error\n"
 msgstr[1] "%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"
 msgstr[0] "Warning: %lu key skipped due to its large size\n"
 msgstr[1] "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:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Primary key fingerprint:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr " Primary key fingerprint:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "      Subkey fingerprint:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr "      Key fingerprint ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr "      Card serial no. ="
 
@@ -6087,7 +6088,7 @@ msgstr "binary"
 msgid "textmode"
 msgstr "textmode"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "unknown"
 
@@ -6224,28 +6225,28 @@ msgstr "Uncompressed"
 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:1614
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "ambiguous option ‘%s’\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "unknown option ‘%s’\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "unknown weak digest ‘%s’\n"
@@ -6360,7 +6361,7 @@ msgstr ""
 "created %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6374,77 +6375,77 @@ msgstr ""
 "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:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Enter JPEG filename for photo ID: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, 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:239
 #, 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:241
 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:257
 #, 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:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Is this photo correct (y/N/q)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "no remote program execution supported\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "unnatural exit of external program\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, 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:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "unable to display photo ID!\n"
@@ -6758,12 +6759,12 @@ msgstr "unknown default recipient “%s�\n"
 msgid "no valid addressees\n"
 msgstr "no valid addressees\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Note: key %s has no %s feature\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Note: key %s has no preference for %s\n"
@@ -7798,7 +7799,7 @@ msgstr "using %s trust model\n"
 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"
@@ -7828,38 +7829,38 @@ msgstr "please do a --check-trustdb\n"
 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"
 msgstr[0] "%d key processed"
 msgstr[1] "%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"
 msgstr[0] " (%d validity count cleared)\n"
 msgstr[1] " (%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"
@@ -7982,7 +7983,7 @@ msgstr ""
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -7990,7 +7991,7 @@ msgstr "%sNumber: %s%%0AHolder: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8020,7 +8021,7 @@ msgstr "|N|Please enter the new Unblocking Key"
 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:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8105,57 +8106,57 @@ msgstr[1] "key generation completed (%d seconds)\n"
 msgid "response does not contain the public key data\n"
 msgstr "response does not contain the public key data\n"
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Please enter the Admin PIN"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 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:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, 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:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, 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:1654
+#: 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:1701
+#: 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:2074
+#: 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:2082
+#: 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:2092
+#: 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:2102
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8163,7 +8164,7 @@ msgstr ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 
-#: scd/app-nks.c:2104
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8171,7 +8172,7 @@ msgstr ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 
-#: scd/app-nks.c:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error getting new PIN: %s\n"
@@ -8427,13 +8428,13 @@ msgstr "handler for fd %d started\n"
 msgid "handler for fd %d terminated\n"
 msgstr "handler for fd %d terminated\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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"
 
@@ -8442,11 +8443,11 @@ msgstr "Tor might be in use - network access is limited"
 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:199 sm/certchain.c:2211
 msgid "chain"
 msgstr "chain"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 msgid "shell"
 msgstr "shell"
 
@@ -8469,234 +8470,234 @@ msgstr "critical marked policy without configured policies"
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "failed to get the fingerprint\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, 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:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "number of issuers matching: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, 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:818
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "number of matching certificates: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "failed to allocate keyDB handle\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1260 sm/certchain.c:1264
 msgid "certificate has been revoked"
 msgstr "certificate has been revoked"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr "the status of the certificate is unknown"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, 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:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certificate not yet valid"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 msgid "root certificate not yet valid"
 msgstr "root certificate not yet valid"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr "intermediate certificate not yet valid"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr "certificate has expired"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 msgid "root certificate has expired"
 msgstr "root certificate has expired"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 msgid "intermediate certificate has expired"
 msgstr "intermediate certificate has expired"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, 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:1404
 msgid "certificate with invalid validity"
 msgstr "certificate with invalid validity"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr "signature not created during lifetime of certificate"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr "certificate not created during lifetime of issuer"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 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:1448
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  signature created at "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certificate created at "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certificate valid from "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     issuer valid from "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingerprint=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, 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:1505
 #, 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:1511
 #, 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:1570
 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:1634
 msgid "no issuer found in certificate"
 msgstr "no issuer found in certificate"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 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:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "root certificate is not marked trusted"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, 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:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr "issuer certificate not found"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, 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:1911 dirmngr/validate.c:693
 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:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr "certificate is good\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "intermediate certificate is good\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, c-format
 msgid "root certificate is good\n"
 msgstr "root certificate is good\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr "switching to chain model"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr "validation model used: %s"
@@ -8719,7 +8720,7 @@ msgstr "out of core\n"
 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:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "none"
 
@@ -8754,42 +8755,42 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "no key usage specified - assuming all usages\n"
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, 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:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, 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:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, 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:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, 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:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certificate is not usable for encryption\n"
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certificate is not usable for signing\n"
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "looking for another certificate\n"
@@ -9339,7 +9340,7 @@ msgstr "hash algorithm used for signer %d: %s (%s)\n"
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "checking for qualified certificate failed: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "%s/%s signature using %s key %s\n"
@@ -9529,7 +9530,7 @@ msgstr "removing cache file ‘%s’\n"
 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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "error closing cache file: %s\n"
@@ -9775,132 +9776,132 @@ msgstr "unknown hash algorithm ‘%s’\n"
 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:1849 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:1923
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse failed: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1938
 #, 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:1945
 #, 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:1949
 #, 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:1969
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "error getting CRL item: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1984
 #, 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:2011
 #, 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:2026
 #, 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:2072
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL signature verification failed: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2084
 #, 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:2226
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new failed: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2233
 #, 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:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert failed: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2301
 #, 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:2308
 #, 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:2333
 #, 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:2337
 #, 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:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "unknown critical CRL extension %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "error reading CRL extensions: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2414
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "creating cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, 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:2460
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9909,12 +9910,12 @@ msgstr ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2497
 #, 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:2520
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -9922,55 +9923,55 @@ msgstr ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2523
 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:2526
 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:2533
 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:2551
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " WARNING: invalid cache record length\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2558
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problem reading cache record: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2569
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problem reading cache key: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr "End CRL dump\n"
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch via DP failed: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert via DP failed: %s\n"
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert via issuer failed: %s\n"
@@ -10311,12 +10312,12 @@ msgstr "usage: %s [options] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "colons are not allowed in the socket name\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fetching CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "processing CRL from ‘%s’ failed: %s\n"
@@ -10560,91 +10561,91 @@ msgstr "hashing the OCSP response for ‘%s’ failed: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "not signed by a default OCSP signer's certificate"
 
-#: dirmngr/ocsp.c:582
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "allocating list item failed: %s\n"
 
-#: dirmngr/ocsp.c:598 dirmngr/ocsp.c:782
+#: 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:642
+#: 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:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "issuer certificate not found: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: 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:698
+#: 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:708
+#: 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:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "no default OCSP responder defined\n"
 
-#: dirmngr/ocsp.c:753
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "no default OCSP signer defined\n"
 
-#: dirmngr/ocsp.c:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "using default OCSP responder ‘%s’\n"
 
-#: dirmngr/ocsp.c:765
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "using OCSP responder ‘%s’\n"
 
-#: dirmngr/ocsp.c:822
+#: 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:847
+#: 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:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "good"
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: 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:901
+#: 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:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP responder returned an too old status\n"
@@ -10658,63 +10659,63 @@ msgstr "assuan_inquire(%s) failed: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire failed: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "error sending data: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch failed: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1776
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert failed: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d exceeded\n"
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "can't allocate control structure: %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "failed to allocate assuan context: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "failed to initialize the server: %s\n"
 
-#: dirmngr/server.c:3062
+#: dirmngr/server.c:3078
 #, 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:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept problem: %s\n"
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan processing failed: %s\n"
@@ -11019,33 +11020,33 @@ msgstr ""
 "Syntax: gpg-check-pattern [options] patternfile\n"
 "Check a passphrase given on stdin against the patternfile\n"
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: 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:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: 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:3437 tools/gpg-card.c:3451
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -11054,43 +11055,43 @@ msgstr ""
 "Warning: Setting the User Interaction Flag to “%s�\n"
 "         can only be reverted using a factory reset!\n"
 
-#: tools/gpg-card.c:3454
+#: 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:3700
+#: tools/gpg-card.c:3758
 msgid "authenticate to the card"
 msgstr "authenticate to the card"
 
-#: tools/gpg-card.c:3702
+#: 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:3704
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "setup KDF for PIN authentication"
 
-#: tools/gpg-card.c:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr "change a private data object"
 
-#: tools/gpg-card.c:3707
+#: 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:3708
+#: 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:3709
+#: 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:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr "Yubikey management commands"
 
-#: tools/gpg-card.c:3712
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr "manage the command history"
diff --git a/po/en@quot.gmo b/po/en@quot.gmo
index 06545c8..aedb076 100644
--- a/po/en@quot.gmo
+++ b/po/en@quot.gmo
diff --git a/po/en@quot.po b/po/en@quot.po
index 6b393b6..00f113b 100644
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.3.8\n"
+"Project-Id-Version: GNU gnupg 2.4.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
-"PO-Revision-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
+"PO-Revision-Date: 2022-12-16 17:50+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en\n"
@@ -162,8 +162,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "does not match - try again"
 
@@ -212,17 +212,17 @@ msgstr "Note: Request from the web browser."
 msgid "Note: Request from a remote site."
 msgstr "Note: Request from a remote site."
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "error getting serial number of card: %s\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Please re-enter this passphrase"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -231,7 +231,7 @@ msgstr ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -244,25 +244,25 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "can't open '%s': %s\n"
@@ -272,12 +272,12 @@ msgstr "can't open '%s': %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "no suitable card key found: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "error getting list of cards: %s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -286,20 +286,20 @@ msgstr ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Allow"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Deny"
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -308,7 +308,7 @@ msgstr ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 
-#: agent/command-ssh.c:3797
+#: agent/command-ssh.c:3837
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "failed to create stream from socket: %s\n"
@@ -432,205 +432,209 @@ msgstr "Please enter the passphrase to%0Aprotect your new key"
 msgid "Please enter the new passphrase"
 msgstr "Please enter the new passphrase"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr "Options used for startup"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr "run in daemon mode (background)"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr "run in server mode (foreground)"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "do not detach from the console"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr "sh-style command output"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr "csh-style command output"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|read options from FILE"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr "Options controlling the diagnostic output"
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "verbose"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "be somewhat more quiet"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|write server mode logs to FILE"
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr "Options controlling the configuration"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 msgid "do not use the SCdaemon"
 msgstr "do not use the SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|use PGM as the SCdaemon program"
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|use PGM as the tpm2daemon program"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|accept some commands via NAME"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr "ignore requests to change the TTY"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr "ignore requests to change the X display"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 msgid "enable ssh support"
 msgstr "enable ssh support"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|use ALGO to show ssh fingerprints"
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 msgid "enable putty support"
 msgstr "enable putty support"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+msgid "enable Win32-OpenSSH support"
+msgstr "enable Win32-OpenSSH support"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "Options controlling the security"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|expire cached PINs after N seconds"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|expire SSH keys after N seconds"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|set maximum PIN cache lifetime to N seconds"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|set maximum SSH key lifetime to N seconds"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr "do not use the PIN cache when signing"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 msgid "disallow the use of an external password cache"
 msgstr "disallow the use of an external password cache"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "disallow clients to mark keys as “trusted�"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 msgid "allow presetting passphrase"
 msgstr "allow presetting passphrase"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr "Options enforcing a passphrase policy"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr "do not allow bypassing the passphrase policy"
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 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:271
+#: agent/gpg-agent.c:279
 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:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|check new passphrases against pattern in FILE"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|expire the passphrase after N days"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 msgid "do not allow the reuse of old passphrases"
 msgstr "do not allow the reuse of old passphrases"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr "Options controlling the PIN-Entry"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 msgid "never use the PIN-entry"
 msgstr "never use the PIN-entry"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr "disallow caller to override the pinentry"
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "let PIN-Entry grab keyboard and mouse"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|use PGM as the PIN-Entry program"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|set the Pinentry timeout to N seconds"
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: 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:570
+#: agent/gpg-agent.c:582
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -638,135 +642,135 @@ msgstr ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "invalid debug-level ‘%s’ given\n"
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "reading options from ‘%s’\n"
 
-#: agent/gpg-agent.c:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: “%s� is a deprecated option\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "can't create socket: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket name ‘%s’ is too long\n"
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "trying to steal socket from running %s\n"
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error getting nonce for the socket\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error binding socket to '%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "can't set permissions of '%s': %s\n"
 
-#: agent/gpg-agent.c:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "listening on socket ‘%s’\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "can't create directory '%s': %s\n"
 
-#: agent/gpg-agent.c:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "directory ‘%s’ created\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() failed for '%s': %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "can't use ‘%s’ as home directory\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error reading nonce on fd %d: %s\n"
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "handler 0x%lx for fd %d started\n"
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "handler 0x%lx for fd %d terminated\n"
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, 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:2853
+#: agent/gpg-agent.c:2967
 #, 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:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect failed: %s - waiting 1s\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stopped\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1034,7 +1038,7 @@ msgstr "checking created signature failed: %s\n"
 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:1602
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "public key algorithm %d (%s) is not supported\n"
@@ -1049,52 +1053,52 @@ msgstr "protection algorithm %d (%s) is not supported\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1124,18 +1128,18 @@ msgstr "Warning: unsafe ownership on %s “%s�\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Warning: unsafe permissions on %s “%s�\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "waiting for file ‘%s’ to become accessible ...\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "yes"
 
@@ -1189,8 +1193,8 @@ msgstr "out of core in secure memory while allocating %lu bytes"
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1210,67 +1214,67 @@ msgstr "WARNING: “%s%s� is an obsolete option - it has no effect\n"
 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:432 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"
@@ -1418,11 +1422,11 @@ msgstr "Certificate chain valid"
 msgid "Root certificate trustworthy"
 msgstr "Root certificate trustworthy"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 msgid "no CRL found for certificate"
 msgstr "no CRL found for certificate"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 msgid "the available CRL is too old"
 msgstr "the available CRL is too old"
 
@@ -1459,7 +1463,7 @@ msgstr "No help available for '%s'."
 msgid "ignoring garbage line"
 msgstr "ignoring garbage line"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "[none]"
 msgstr "[none]"
 
@@ -1503,36 +1507,36 @@ msgstr "iconv_open failed: %s\n"
 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
 #, 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"
@@ -1542,104 +1546,104 @@ msgstr "waiting for lock %s...\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s is too old (need %s, have %s)\n"
 
-#: g10/armor.c:441
+#: 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:1462
+#: g10/build-packet.c:1480
 #, c-format
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "[ not human readable (%zu bytes: %s%s) ]"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1648,32 +1652,32 @@ msgstr ""
 "a notation name must have only printable characters or spaces, and end with "
 "an ‘=’\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, 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:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, 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:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNING: invalid notation data found\n"
@@ -1687,7 +1691,7 @@ msgstr "failed to proxy %s inquiry to client\n"
 msgid "Enter passphrase: "
 msgstr "Enter passphrase: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 g10/sign.c:473
 #: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
@@ -1704,7 +1708,7 @@ msgstr "error from TPM: %s\n"
 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:2330
+#: 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"
@@ -1742,169 +1746,169 @@ msgstr "unacceptable HTTP redirect from server was cleaned up"
 msgid "server uses an invalid certificate"
 msgstr "server uses an invalid certificate"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "Mr."
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "Ms."
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "forced"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 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:1500
+#: g10/card-util.c:803 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:1502
+#: g10/card-util.c:805 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:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Cardholder's surname: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Cardholder's given name: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Login data (account name): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Private DO data: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Language preferences: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 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:1800
+#: g10/card-util.c:1199 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Error: invalid response.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 msgid "not an OpenPGP card"
 msgstr "not an OpenPGP card"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr "Replace existing key? (y/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -1916,99 +1920,99 @@ msgstr ""
 "      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:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr "Changing card key attribute for: "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 msgid "Signature key\n"
 msgstr "Signature key\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 msgid "Encryption key\n"
 msgstr "Encryption key\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr "Authentication key\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Invalid selection.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 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:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2019,176 +2023,176 @@ msgstr ""
 "   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:1741
 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:1743 g10/card-util.c:1833
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signature key\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1744 g10/card-util.c:1835
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Encryption key\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentication key\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 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:1876
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD failed: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 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:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "quit this menu"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr "show admin commands"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "show this help"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "list all available data"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3687
+#: g10/card-util.c:2260 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:3688
+#: g10/card-util.c:2261 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:3689
+#: g10/card-util.c:2262 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:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "change the login name"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "change the language preferences"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 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:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "change a CA fingerprint"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 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:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "generate new keys"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 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:3698
+#: g10/card-util.c:2271 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:3699
+#: g10/card-util.c:2272 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:3703
+#: g10/card-util.c:2273 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:2275
 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:2276
 msgid "change the key attribute"
 msgstr "change the key attribute"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 msgid "Admin-only command\n"
 msgstr "Admin-only command\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr "Admin commands are allowed\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output doesn't work for this command\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2246,9 +2250,9 @@ msgstr "key"
 msgid "subkey"
 msgstr "subkey"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "update failed: %s\n"
@@ -2280,18 +2284,18 @@ msgid ""
 msgstr ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr "(use option “%s� to override)\n"
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, 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"
@@ -2301,43 +2305,43 @@ msgstr "cipher algorithm ‘%s’ may not be used in %s mode\n"
 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:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creating passphrase: %s\n"
 
-#: g10/encrypt.c:481
+#: g10/encrypt.c:473
 #, 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:512
+#: g10/encrypt.c:503
 #, c-format
 msgid "using cipher %s.%s\n"
 msgstr "using cipher %s.%s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "‘%s’ already compressed\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "WARNING: ‘%s’ is an empty file\n"
 
-#: g10/encrypt.c:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, 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:862
+#: g10/encrypt.c:853
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "reading from ‘%s’\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2346,12 +2350,12 @@ msgstr ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, c-format
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s.%s encrypted for: “%s�\n"
 
-#: g10/encrypt.c:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "option ‘%s’ may not be used in %s mode\n"
@@ -2378,61 +2382,69 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "WARNING: nothing exported\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2496,7 +2508,7 @@ msgstr "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "using subkey %s instead of primary key %s\n"
 
-#: g10/getkey.c:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "valid values for option '%s':\n"
@@ -2569,111 +2581,111 @@ msgstr "quickly revoke a user-id"
 msgid "quickly set a new expiration date"
 msgstr "quickly set a new expiration date"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr "full featured key pair generation"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "generate a revocation certificate"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "remove keys from the public keyring"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "remove keys from the secret keyring"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "quickly sign a key"
 msgstr "quickly sign a key"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 msgid "quickly sign a key locally"
 msgstr "quickly sign a key locally"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "quickly revoke a key signature"
 msgstr "quickly revoke a key signature"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "sign a key"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "sign a key locally"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "sign or edit a key"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "change a passphrase"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "export keys"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "export keys to a keyserver"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "import keys from a keyserver"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "search for keys on a keyserver"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "update all keys from a keyserver"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "import/merge keys"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr "print the card status"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr "change data on a card"
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr "change a card's PIN"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "update the trust database"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 msgid "print message digests"
 msgstr "print message digests"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "run in server mode"
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|set the TOFU policy for a key"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|use NAME as default secret key"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|encrypt to user ID NAME as well"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|set up email aliases"
 
@@ -2689,51 +2701,51 @@ msgstr "do not make any changes"
 msgid "prompt before overwriting"
 msgstr "prompt before overwriting"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr "Options controlling the input"
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr "Options controlling the output"
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "create ascii armored output"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|write output to FILE"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "use canonical text mode"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set compress level to N (0 disables)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr "Options controlling key import and export"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 msgid "import missing key from a signature"
 msgstr "import missing key from a signature"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 msgid "include the public key in signatures"
 msgstr "include the public key in signatures"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "disable all access to the dirmngr"
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr "Options controlling key listings"
 
@@ -2757,7 +2769,7 @@ msgstr "Options for unattended use"
 msgid "Other options"
 msgstr "Other options"
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2765,7 +2777,7 @@ msgstr ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2785,11 +2797,11 @@ msgstr ""
 " --list-keys [names]        show keys\n"
 " --fingerprint [names]      show fingerprints\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Usage: @GPG@ [options] [files] (-h for help)"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1172
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2799,7 +2811,7 @@ msgstr ""
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2807,556 +2819,545 @@ msgstr ""
 "\n"
 "Supported algorithms:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "usage: %s [options] %s\n"
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = sign found in group definition ‘%s’\n"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1698
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, 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:1735
+#: g10/gpg.c:1725
 #, 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:1738
+#: g10/gpg.c:1728
 #, 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:1744
+#: g10/gpg.c:1734
 #, 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:1747
+#: g10/gpg.c:1737
 #, 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:1750
+#: g10/gpg.c:1740
 #, 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:1966
+#: g10/gpg.c:1956
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "unknown configuration item ‘%s’\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr "display photo IDs during key listings"
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 msgid "show key usage information during key listings"
 msgstr "show key usage information during key listings"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr "show policy URLs during signature listings"
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 msgid "show all notations during signature listings"
 msgstr "show all notations during signature listings"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr "show IETF standard notations during signature listings"
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr "show user-supplied notations during signature listings"
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "show preferred keyserver URLs during signature listings"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr "show user ID validity during key listings"
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr "show revoked and expired user IDs in key listings"
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr "show revoked and expired subkeys in key listings"
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 msgid "show the keyring name in key listings"
 msgstr "show the keyring name in key listings"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 msgid "show expiration dates during signature listings"
 msgstr "show expiration dates during signature listings"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+msgid "show preferences"
+msgstr "show preferences"
+
+#: g10/gpg.c:2197
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "unknown TOFU policy ‘%s’\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(use “help� to list choices)\n"
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Note: %s is not for normal use!\n"
 
-#: g10/gpg.c:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’ is not a valid signature expiration\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s� is not a proper mail address\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "invalid pinentry mode ‘%s’\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "invalid request origin ‘%s’\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’ is not a valid character set\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "could not parse keyserver URL\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: invalid keyserver options\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "invalid keyserver options\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "invalid filter option: %s\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr "display photo IDs during signature verification"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr "show policy URLs during signature verification"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 msgid "show all notations during signature verification"
 msgstr "show all notations during signature verification"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr "show IETF standard notations during signature verification"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr "show user-supplied notations during signature verification"
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "show preferred keyserver URLs during signature verification"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 msgid "show user ID validity during signature verification"
 msgstr "show user ID validity during signature verification"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "show revoked and expired user IDs in signature verification"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 msgid "show only the primary user ID in signature verification"
 msgstr "show only the primary user ID in signature verification"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "invalid argument for option “%.50s�\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNING: running with faked system time: "
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, 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:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/gpg.c:3952
-#, c-format
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "selected AEAD algorithm is invalid\n"
-
-#: g10/gpg.c:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/gpg.c:4015
-#, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr "invalid personal AEAD preferences\n"
-
-#: g10/gpg.c:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "chunk size invalid - using %d\n"
 
-#: g10/gpg.c:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, 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:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, 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:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export as ssh key failed: %s\n"
 
-#: g10/gpg.c:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "invalid hash algorithm ‘%s’\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, 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:5366
+#: g10/gpg.c:5322
 #, 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:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "the given preferred keyserver URL is invalid\n"
@@ -3369,7 +3370,7 @@ msgstr "|FILE|take the keys from the keyring FILE"
 msgid "make timestamp conflicts only a warning"
 msgstr "make timestamp conflicts only a warning"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 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"
 
@@ -3398,153 +3399,153 @@ msgstr "No help available"
 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"
@@ -3553,172 +3554,172 @@ msgstr ""
 "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:1998 g10/import.c:3146
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "key %s: no user ID\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, c-format
 msgid "key %s: %s\n"
 msgstr "key %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr "rejected by import screener"
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "key %s: new key - skipped\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "error writing keyring '%s': %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "key %s: secret key imported\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, 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:2801
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "key %s: error sending to agent: %s\n"
@@ -3731,197 +3732,197 @@ msgstr "key %s: error sending to agent: %s\n"
 #. * 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:2970
 #, 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:3117
 #, 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:3138 g10/import.c:3177
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "importing secret keys not allowed\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "reason for revocation: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "revocation comment: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "key %s: invalid subkey binding\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3788
 #, 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:3812
 #, 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:3825
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "key %s: invalid subkey revocation\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3840
 #, 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:3887
 #, 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:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "key %s: skipped subkey\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "key %s: direct key signature added\n"
@@ -3960,14 +3961,14 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "%d duplicate signature removed\n"
 msgstr[1] "%d duplicate signatures removed\n"
 
-#: g10/key-check.c:726 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"
 msgstr[0] "%d signature not checked due to a missing key\n"
 msgstr[1] "%d signatures not checked due to missing keys\n"
 
-#: g10/key-check.c:734 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"
@@ -4020,15 +4021,15 @@ msgstr "keyblock resource '%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "failed to rebuild keyring cache: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[revocation]"
 msgstr "[revocation]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4040,17 +4041,17 @@ msgstr ""
 "(by looking at passports, checking fingerprints from different sources, "
 "etc.)\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 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:390 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:408
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4060,50 +4061,50 @@ msgstr ""
 "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:425
 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:553
 #, 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:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  Unable to sign.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID “%s� is expired."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, 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:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User ID “%s� is signable.  "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr "Sign it? (y/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4112,11 +4113,11 @@ msgstr ""
 "The self-signature on “%s�\n"
 "is a PGP 2.x-style signature.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4125,12 +4126,12 @@ msgstr ""
 "Your current signature on “%s�\n"
 "has expired.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4139,43 +4140,43 @@ msgstr ""
 "Your current signature on “%s�\n"
 "is a local signature.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "This key has expired!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4185,31 +4186,31 @@ msgstr ""
 "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:874
 #, 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:876
 #, 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:878
 #, 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:881
 #, 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:888
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Your selection? (enter ‘?’ for more information): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4218,226 +4219,226 @@ msgstr ""
 "Are you sure that you want to sign this key with your\n"
 "key “%s� (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 msgid "This will be a self-signature.\n"
 msgstr "This will be a self-signature.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 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:935
 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:945
 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:952
 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:959
 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:964
 msgid "I have checked this key casually.\n"
 msgstr "I have checked this key casually.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 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:981
 msgid "Really sign? (y/N) "
 msgstr "Really sign? (y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signing failed: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 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:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "save and quit"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 msgid "show key fingerprint"
 msgstr "show key fingerprint"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "show the keygrip"
 msgstr "show the keygrip"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "list key and user IDs"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "select user ID N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr "select subkey N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr "check signatures"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 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:1286
 msgid "sign selected user IDs locally"
 msgstr "sign selected user IDs locally"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 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:1289
 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:1291
 msgid "add a user ID"
 msgstr "add a user ID"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "add a photo ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr "delete selected user IDs"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr "add a subkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr "add a key to a smartcard"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr "move a key to a smartcard"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 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:1306
 msgid "move a backup key to a smartcard"
 msgstr "move a backup key to a smartcard"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 msgid "delete selected subkeys"
 msgstr "delete selected subkeys"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "add a revocation key"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 msgid "delete signatures from the selected user IDs"
 msgstr "delete signatures from the selected user IDs"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1314
 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:1316
 msgid "flag the selected user ID as primary"
 msgstr "flag the selected user ID as primary"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "list preferences (expert)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "list preferences (verbose)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 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:1325
 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:1327
 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:1329
 msgid "change the passphrase"
 msgstr "change the passphrase"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "change the ownertrust"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 msgid "revoke signatures on the selected user IDs"
 msgstr "revoke signatures on the selected user IDs"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 msgid "revoke selected user IDs"
 msgstr "revoke selected user IDs"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "revoke key or selected subkeys"
 msgstr "revoke key or selected subkeys"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "enable key"
 msgstr "enable key"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr "disable key"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr "show selected photo IDs"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 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:1349
 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:1470
 msgid "Secret key is available.\n"
 msgstr "Secret key is available.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 msgid "Secret subkeys are available.\n"
 msgstr "Secret subkeys are available.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1574
 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:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4449,284 +4450,268 @@ msgstr ""
 "  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:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "Key is revoked."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 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:1682
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Really sign all user IDs? (y/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1690
 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:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Use the ‘%s’ command.)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 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:1756
 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:1814 g10/keyedit.c:1854
 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 msgid "You must select exactly one key.\n"
 msgstr "You must select exactly one key.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 msgid "Command expects a filename argument\n"
 msgstr "Command expects a filename argument\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "Can't open '%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, 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:1969
 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:1975
 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:1977
 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:2015
 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:2016
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Really revoke this user ID? (y/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2034
 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:2045
 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:2047
 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:2105
 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:2150
 msgid "Set preference list to:\n"
 msgstr "Set preference list to:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 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:2159
 msgid "Really update the preferences? (y/N) "
 msgstr "Really update the preferences? (y/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Save changes? (y/N) "
 msgstr "Save changes? (y/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr "Quit without saving? (y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Key not changed so no update needed.\n"
 
-#: g10/keyedit.c:2557
+#: g10/keyedit.c:2558
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2584
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "revoking the user ID failed: %s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "setting the primary user ID failed: %s\n"
 
-#: g10/keyedit.c:2677
+#: g10/keyedit.c:2717
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "“%s� is not a fingerprint\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "“%s� is not the primary fingerprint\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Invalid user ID '%s': %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "No matching user IDs."
 msgstr "No matching user IDs."
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "Nothing to sign.\n"
 msgstr "Nothing to sign.\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Not signed by you.\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "revoking the key signature failed: %s\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3251
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "‘%s’ is not a valid expiration time\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "“%s� is not a proper fingerprint\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "subkey “%s� not found\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr "AEAD: "
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Digest: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Features: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr "Keyserver no-modify"
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Preferred keyserver: "
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr "Notations: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr "(sensitive)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "created: %s"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr "revoked: %s"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr "expired: %s"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "expires: %s"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr "usage: %s"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr "card-no: "
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr "trust: %s"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr "validity: %s"
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "This key has been disabled"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4734,17 +4719,17 @@ msgstr ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "expired"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4753,17 +4738,17 @@ msgstr ""
 "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:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "WARNING: Your encryption subkey expires soon.\n"
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4773,72 +4758,72 @@ msgstr ""
 "versions\n"
 "         of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 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:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 msgid "Such a user ID already exists on this key!"
 msgstr "Such a user ID already exists on this key!"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Delete this good signature? (y/N/q)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Delete this invalid signature? (y/N/q)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Delete this unknown signature? (y/N/q)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Really delete this self-signature? (y/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Deleted %d signature.\n"
 msgstr[1] "Deleted %d signatures.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Nothing deleted.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "invalid"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID “%s� compacted: %s\n"
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "User ID “%s�: %d signature removed\n"
 msgstr[1] "User ID “%s�: %d signatures removed\n"
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID “%s�: already minimized\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID “%s�: already clean\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4848,40 +4833,40 @@ msgstr ""
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Enter the user ID of the designated revoker: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 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:4719
+#: g10/keyedit.c:4611
 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:4788
+#: g10/keyedit.c:4680
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -4889,171 +4874,171 @@ msgstr ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changing expiration time for a subkey.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changing expiration time for the primary key.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 msgid "Changing usage of a subkey.\n"
 msgstr "Changing usage of a subkey.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 msgid "Changing usage of the primary key.\n"
 msgstr "Changing usage of the primary key.\n"
 
-#: g10/keyedit.c:5033
+#: g10/keyedit.c:4925
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signing subkey %s is already cross-certified\n"
 
-#: g10/keyedit.c:5039
+#: g10/keyedit.c:4931
 #, 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:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Please select exactly one user ID.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, 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:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr "Enter your preferred keyserver URL: "
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 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:5451
+#: g10/keyedit.c:5345
 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:5516
+#: g10/keyedit.c:5410
 msgid "Enter the notation: "
 msgstr "Enter the notation: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 msgid "Proceed? (y/N) "
 msgstr "Proceed? (y/N) "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No user ID with index %d\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No user ID with hash %s\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No subkey with key ID '%s'.\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No subkey with index %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: “%s�\n"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "This signature expired on %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 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:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Create a revocation certificate for this signature? (y/N) "
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr " (non-revocable)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revoked by your key %s on %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "You are about to revoke these signatures:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Really create the revocation certificates? (y/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "no secret key\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, 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:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "user ID “%s� is already revoked\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Key %s is already revoked.\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subkey %s is already revoked.\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, 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"
@@ -5093,52 +5078,52 @@ msgstr "too many AEAD preferences\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "invalid item ‘%s’ in preference string\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "writing direct signature\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "writing self signature\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "writing key binding signature\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize invalid; using %u bits\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize rounded up to %u bits\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, 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:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr "Certify"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr "Authenticate"
 
@@ -5152,166 +5137,166 @@ msgstr "Authenticate"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "Possible actions for this %s key: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr "Current allowed actions: "
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Toggle the sign capability\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Toggle the encrypt capability\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Toggle the authenticate capability\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Finished\n"
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA and RSA%s\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA and Elgamal%s\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, c-format
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (sign only)%s\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2113
 #, c-format
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (sign only)%s\n"
 
-#: g10/keygen.c:2142
+#: g10/keygen.c:2119
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (encrypt only)%s\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, c-format
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (encrypt only)%s\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2127
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (set your own capabilities)%s\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (set your own capabilities)%s\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ECC (sign and encrypt)%s\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 msgid " *default*"
 msgstr " *default*"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (sign only)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) ECC (set your own capabilities)%s\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, c-format
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC (encrypt only)%s\n"
 
-#: g10/keygen.c:2167
+#: g10/keygen.c:2144
 #, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) Existing key%s\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "  (%d) Existing key from card%s\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Enter the keygrip: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "No key with this keygrip\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 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:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Available keys:\n"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "rounded to %u bits\n"
 
-#: g10/keygen.c:2570
+#: g10/keygen.c:2547
 #, 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:2578
+#: g10/keygen.c:2555
 #, 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:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Requested keysize is %u bits\n"
 
-#: g10/keygen.c:2641
+#: g10/keygen.c:2618
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Please select which elliptic curve you want:\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5327,7 +5312,7 @@ msgstr ""
 "      <n>m = key expires in n months\n"
 "      <n>y = key expires in n years\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5343,38 +5328,38 @@ msgstr ""
 "      <n>m = signature expires in n months\n"
 "      <n>y = signature expires in n years\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Key is valid for? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature is valid for? (%s) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "invalid value\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr "Key does not expire at all\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr "Signature does not expire at all\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key expires at %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature expires at %s\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5382,11 +5367,11 @@ msgstr ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr "Is this correct? (y/N) "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5400,7 +5385,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5416,41 +5401,41 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>�\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Real name: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Invalid character in name\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, 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:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "Email address: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Not a valid email address\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Comment: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Invalid character in comment\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "You are using the ‘%s’ character set.\n"
 
-#: g10/keygen.c:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5461,11 +5446,11 @@ msgstr ""
 "    “%s�\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Such a user ID already exists on this key!\n"
 
@@ -5480,31 +5465,31 @@ msgstr "Such a user ID already exists on this key!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Change (N)ame, (E)mail, or (Q)uit? "
 
-#: g10/keygen.c:3148
+#: g10/keygen.c:3125
 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Please correct the error first\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5516,18 +5501,18 @@ msgstr ""
 "disks) during the prime generation; this gives the random number\n"
 "generator a better chance to gain enough entropy.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, 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:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Key generation failed: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5538,64 +5523,64 @@ msgstr ""
 "    “%s�\n"
 "\n"
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr "Continue? (Y/n) "
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "A key for “%s� already exists\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 msgid "Create anyway? (y/N) "
 msgstr "Create anyway? (y/N) "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, c-format
 msgid "creating anyway\n"
 msgstr "creating anyway\n"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, 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:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Key generation canceled.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "can't create backup file '%s': %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "writing public key to ‘%s’\n"
 
-#: g10/keygen.c:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "no writable public keyring found: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "error writing public keyring '%s': %s\n"
 
-#: g10/keygen.c:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "public and secret key created and signed.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 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"
@@ -5603,36 +5588,36 @@ msgstr ""
 "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:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, 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:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, 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:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr "Really create? (y/N) "
 
@@ -5640,74 +5625,90 @@ msgstr "Really create? (y/N) "
 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"
 msgstr[0] "%d good signature\n"
 msgstr[1] "%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"
 msgstr[0] "%d signature not checked due to an error\n"
 msgstr[1] "%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"
 msgstr[0] "Warning: %lu key skipped due to its large size\n"
 msgstr[1] "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:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Primary key fingerprint:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr " Primary key fingerprint:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "      Subkey fingerprint:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr "      Key fingerprint ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr "      Card serial no. ="
 
@@ -6074,7 +6075,7 @@ msgstr "binary"
 msgid "textmode"
 msgstr "textmode"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "unknown"
 
@@ -6210,28 +6211,28 @@ msgstr "Uncompressed"
 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:1614
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "ambiguous option ‘%s’\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "unknown option ‘%s’\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "unknown weak digest ‘%s’\n"
@@ -6346,7 +6347,7 @@ msgstr ""
 "created %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6360,77 +6361,77 @@ msgstr ""
 "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:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Enter JPEG filename for photo ID: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, 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:239
 #, 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:241
 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:257
 #, 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:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Is this photo correct (y/N/q)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "no remote program execution supported\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "unnatural exit of external program\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, 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:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "unable to display photo ID!\n"
@@ -6744,12 +6745,12 @@ msgstr "unknown default recipient “%s�\n"
 msgid "no valid addressees\n"
 msgstr "no valid addressees\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Note: key %s has no %s feature\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Note: key %s has no preference for %s\n"
@@ -7783,7 +7784,7 @@ msgstr "using %s trust model\n"
 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"
@@ -7813,38 +7814,38 @@ msgstr "please do a --check-trustdb\n"
 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"
 msgstr[0] "%d key processed"
 msgstr[1] "%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"
 msgstr[0] " (%d validity count cleared)\n"
 msgstr[1] " (%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"
@@ -7967,7 +7968,7 @@ msgstr ""
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -7975,7 +7976,7 @@ msgstr "%sNumber: %s%%0AHolder: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8005,7 +8006,7 @@ msgstr "|N|Please enter the new Unblocking Key"
 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:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8090,57 +8091,57 @@ msgstr[1] "key generation completed (%d seconds)\n"
 msgid "response does not contain the public key data\n"
 msgstr "response does not contain the public key data\n"
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Please enter the Admin PIN"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 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:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, 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:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, 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:1654
+#: 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:1701
+#: 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:2074
+#: 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:2082
+#: 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:2092
+#: 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:2102
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8148,7 +8149,7 @@ msgstr ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 
-#: scd/app-nks.c:2104
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8156,7 +8157,7 @@ msgstr ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 
-#: scd/app-nks.c:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error getting new PIN: %s\n"
@@ -8412,13 +8413,13 @@ msgstr "handler for fd %d started\n"
 msgid "handler for fd %d terminated\n"
 msgstr "handler for fd %d terminated\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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"
 
@@ -8427,11 +8428,11 @@ msgstr "Tor might be in use - network access is limited"
 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:199 sm/certchain.c:2211
 msgid "chain"
 msgstr "chain"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 msgid "shell"
 msgstr "shell"
 
@@ -8454,234 +8455,234 @@ msgstr "critical marked policy without configured policies"
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "failed to get the fingerprint\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, 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:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "number of issuers matching: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, 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:818
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "number of matching certificates: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "failed to allocate keyDB handle\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1260 sm/certchain.c:1264
 msgid "certificate has been revoked"
 msgstr "certificate has been revoked"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr "the status of the certificate is unknown"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, 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:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certificate not yet valid"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 msgid "root certificate not yet valid"
 msgstr "root certificate not yet valid"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr "intermediate certificate not yet valid"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr "certificate has expired"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 msgid "root certificate has expired"
 msgstr "root certificate has expired"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 msgid "intermediate certificate has expired"
 msgstr "intermediate certificate has expired"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, 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:1404
 msgid "certificate with invalid validity"
 msgstr "certificate with invalid validity"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr "signature not created during lifetime of certificate"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr "certificate not created during lifetime of issuer"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 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:1448
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  signature created at "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certificate created at "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certificate valid from "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     issuer valid from "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingerprint=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, 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:1505
 #, 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:1511
 #, 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:1570
 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:1634
 msgid "no issuer found in certificate"
 msgstr "no issuer found in certificate"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 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:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "root certificate is not marked trusted"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, 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:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr "issuer certificate not found"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, 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:1911 dirmngr/validate.c:693
 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:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr "certificate is good\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "intermediate certificate is good\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, c-format
 msgid "root certificate is good\n"
 msgstr "root certificate is good\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr "switching to chain model"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr "validation model used: %s"
@@ -8704,7 +8705,7 @@ msgstr "out of core\n"
 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:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "none"
 
@@ -8739,42 +8740,42 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "no key usage specified - assuming all usages\n"
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, 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:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, 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:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, 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:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, 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:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certificate is not usable for encryption\n"
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certificate is not usable for signing\n"
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "looking for another certificate\n"
@@ -9324,7 +9325,7 @@ msgstr "hash algorithm used for signer %d: %s (%s)\n"
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "checking for qualified certificate failed: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "%s/%s signature using %s key %s\n"
@@ -9514,7 +9515,7 @@ msgstr "removing cache file ‘%s’\n"
 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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "error closing cache file: %s\n"
@@ -9760,132 +9761,132 @@ msgstr "unknown hash algorithm ‘%s’\n"
 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:1849 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:1923
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse failed: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1938
 #, 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:1945
 #, 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:1949
 #, 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:1969
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "error getting CRL item: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1984
 #, 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:2011
 #, 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:2026
 #, 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:2072
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL signature verification failed: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2084
 #, 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:2226
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new failed: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2233
 #, 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:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert failed: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2301
 #, 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:2308
 #, 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:2333
 #, 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:2337
 #, 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:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "unknown critical CRL extension %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "error reading CRL extensions: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2414
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "creating cache file ‘%s’\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, 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:2460
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9894,12 +9895,12 @@ msgstr ""
 "updating the DIR file failed - cache entry will get lost with the next "
 "program start\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2497
 #, 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:2520
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -9907,55 +9908,55 @@ msgstr ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2523
 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:2526
 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:2533
 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:2551
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " WARNING: invalid cache record length\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2558
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "problem reading cache record: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2569
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "problem reading cache key: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr "End CRL dump\n"
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch via DP failed: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert via DP failed: %s\n"
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert via issuer failed: %s\n"
@@ -10295,12 +10296,12 @@ msgstr "usage: %s [options] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "colons are not allowed in the socket name\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fetching CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "processing CRL from ‘%s’ failed: %s\n"
@@ -10544,91 +10545,91 @@ msgstr "hashing the OCSP response for ‘%s’ failed: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "not signed by a default OCSP signer's certificate"
 
-#: dirmngr/ocsp.c:582
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "allocating list item failed: %s\n"
 
-#: dirmngr/ocsp.c:598 dirmngr/ocsp.c:782
+#: 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:642
+#: 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:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "issuer certificate not found: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: 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:698
+#: 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:708
+#: 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:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "no default OCSP responder defined\n"
 
-#: dirmngr/ocsp.c:753
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "no default OCSP signer defined\n"
 
-#: dirmngr/ocsp.c:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "using default OCSP responder ‘%s’\n"
 
-#: dirmngr/ocsp.c:765
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "using OCSP responder ‘%s’\n"
 
-#: dirmngr/ocsp.c:822
+#: 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:847
+#: 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:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "good"
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: 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:901
+#: 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:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP responder returned an too old status\n"
@@ -10642,63 +10643,63 @@ msgstr "assuan_inquire(%s) failed: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire failed: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "error sending data: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch failed: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1776
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert failed: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d exceeded\n"
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "can't allocate control structure: %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "failed to allocate assuan context: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "failed to initialize the server: %s\n"
 
-#: dirmngr/server.c:3062
+#: dirmngr/server.c:3078
 #, 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:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept problem: %s\n"
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan processing failed: %s\n"
@@ -11003,33 +11004,33 @@ msgstr ""
 "Syntax: gpg-check-pattern [options] patternfile\n"
 "Check a passphrase given on stdin against the patternfile\n"
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: 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:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: 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:3437 tools/gpg-card.c:3451
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -11038,43 +11039,43 @@ msgstr ""
 "Warning: Setting the User Interaction Flag to “%s�\n"
 "         can only be reverted using a factory reset!\n"
 
-#: tools/gpg-card.c:3454
+#: 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:3700
+#: tools/gpg-card.c:3758
 msgid "authenticate to the card"
 msgstr "authenticate to the card"
 
-#: tools/gpg-card.c:3702
+#: 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:3704
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "setup KDF for PIN authentication"
 
-#: tools/gpg-card.c:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr "change a private data object"
 
-#: tools/gpg-card.c:3707
+#: 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:3708
+#: 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:3709
+#: 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:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr "Yubikey management commands"
 
-#: tools/gpg-card.c:3712
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr "manage the command history"
diff --git a/po/eo.po b/po/eo.po
index 2de697f..a15451a 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -143,8 +143,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "malbona pasfrazo"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
@@ -198,25 +198,25 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, 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:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -227,26 +227,26 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -257,39 +257,39 @@ msgstr "ne povas malfermi '%s': %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, 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:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, 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:3797
+#: agent/command-ssh.c:3837
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
@@ -421,208 +421,214 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "detala eligo"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualigi la fido-datenaron"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 #, 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:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "ne realigita"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "ne realigita"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "ne realigita"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|uzi pasfraz-re�imon N"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "uzi gpg-agent"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
@@ -630,147 +636,147 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:570
+#: agent/gpg-agent.c:582
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, 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:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, fuzzy, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Valida atestilrevoko"
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, fuzzy, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2853
+#: agent/gpg-agent.c:2967
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu �losiloj ignoritaj\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1032,7 +1038,7 @@ msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 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:1602
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1050,52 +1056,52 @@ msgstr "protekto-metodo %d%s ne estas realigita\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1126,18 +1132,18 @@ msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 #, fuzzy
 msgid "yes"
 msgstr "jes"
@@ -1193,8 +1199,8 @@ msgstr ""
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1214,69 +1220,69 @@ msgstr "AVERTO: '%s' estas malplena dosiero\n"
 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:432 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"
@@ -1448,12 +1454,12 @@ msgstr ""
 "Neniom da atestiloj trovitaj kun nedifinita fidovaloro.\n"
 "\n"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Bona atestilo"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenia helpo disponata"
@@ -1495,7 +1501,7 @@ msgstr "Nenia helpo disponata por '%s'"
 msgid "ignoring garbage line"
 msgstr "eraro en vostolinio\n"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 #, fuzzy
 msgid "[none]"
 msgstr "nekonata versio"
@@ -1540,36 +1546,36 @@ msgstr "ne povas malfermi %s: %s\n"
 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
 #, 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"
@@ -1579,92 +1585,92 @@ msgstr "skribas sekretan �losilon al '%s'\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: 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"
@@ -1672,13 +1678,13 @@ msgstr ""
 "quoted-printable-signo en kiraso - ver�ajne cima po�totransendilo estis "
 "uzata\n"
 
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "ne homlegebla"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, fuzzy, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1687,34 +1693,34 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn aÅ­ substrekojn "
 "kaj fini per '='\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, 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:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, 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:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTO: nevalida notacia dateno trovita\n"
@@ -1728,7 +1734,7 @@ msgstr "malsukcesis meti '%s' en fido-datenaron: %s\n"
 msgid "Enter passphrase: "
 msgstr "Donu pasfrazon: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 g10/sign.c:473
 #: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, fuzzy, c-format
 msgid "%s is not compliant with %s mode\n"
@@ -1745,7 +1751,7 @@ msgstr "eraro dum legado de '%s': %s\n"
 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:2330
+#: 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"
@@ -1787,177 +1793,177 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "krei revokatestilon"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1500
+#: g10/card-util.c:803 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1502
+#: g10/card-util.c:805 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualigitaj preferoj"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 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:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingrospuro:"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -1965,102 +1971,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 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:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2068,197 +2074,197 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 #, 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:1743 g10/card-util.c:1833
 #, 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:1744 g10/card-util.c:1835
 #, 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:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1876
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "forlasi ĉi tiun menuon"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 #, fuzzy
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "montri ĉi tiun helpon"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 tools/gpg-card.c:3743
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenia helpo disponata"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3689
+#: g10/card-util.c:2262 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3690
+#: g10/card-util.c:2263 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:3691
+#: g10/card-util.c:2264 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:3692
+#: g10/card-util.c:2265 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 #, fuzzy
 msgid "generate new keys"
 msgstr "krei novan �losilparon"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3698
+#: g10/card-util.c:2271 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 #, 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:2276
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "�an�i la posedantofidon"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 #, 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por ĉi tiu komando\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2319,9 +2325,9 @@ msgstr "�losilo"
 msgid "subkey"
 msgstr "al"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
@@ -2352,18 +2358,18 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, 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"
@@ -2373,58 +2379,58 @@ msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/encrypt.c:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/encrypt.c:481
+#: g10/encrypt.c:473
 #, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 msgid "using cipher %s.%s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, 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:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, 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:862
+#: g10/encrypt.c:853
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "legas el '%s'\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, 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:1160
+#: g10/encrypt.c:1151
 #, fuzzy, c-format
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s-ĉifrita por: %s\n"
 
-#: g10/encrypt.c:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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"
@@ -2452,68 +2458,79 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2582,7 +2599,7 @@ msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uzas flankan �losilon %08lX anstataŭ la ĉefa �losilo %08lX\n"
 
-#: g10/getkey.c:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "nevalida kiraso"
@@ -2666,120 +2683,120 @@ msgstr "krei novan �losilparon"
 msgid "quickly set a new expiration date"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "subskribi aŭ redakti �losilon"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "serĉi �losilojn ĉe �losilservilo"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "aktualigi ĉiujn �losilojn de �losilservilo"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 #, fuzzy
 msgid "print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOMO|ĉifri por NOMO"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
@@ -2795,56 +2812,56 @@ msgstr "fari neniajn �an�ojn"
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2872,7 +2889,7 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2880,7 +2897,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de ĉiuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2910,13 +2927,13 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 #, 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:1175
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2931,7 +2948,7 @@ msgstr ""
 "subskribi, kontroli, ĉifri aŭ malĉifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2939,569 +2956,559 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1698
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1716
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1735
+#: g10/gpg.c:1725
 #, 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:1738
+#: g10/gpg.c:1728
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1744
+#: g10/gpg.c:1734
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1747
+#: g10/gpg.c:1737
 #, 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:1750
+#: g10/gpg.c:1740
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1966
+#: g10/gpg.c:1956
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "agordi liston de preferoj"
+
+#: g10/gpg.c:2197
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, 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:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, fuzzy, c-format
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, fuzzy, c-format
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita ĉifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3952
-#, 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:3964
+#: g10/gpg.c:3927
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita ĉifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, fuzzy, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, fuzzy, c-format
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, fuzzy, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:4015
-#, fuzzy, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr "nevalidaj preferoj\n"
-
-#: g10/gpg.c:4019
+#: g10/gpg.c:3979
 #, fuzzy, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, fuzzy, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, 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:4074
+#: g10/gpg.c:4034
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:4388
+#: g10/gpg.c:4336
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "malĉifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, fuzzy, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4928
+#: g10/gpg.c:4884
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -3516,7 +3523,7 @@ msgstr "Ĉu forvi�i ĉi tiun �losilon de la �losilaro? "
 msgid "make timestamp conflicts only a warning"
 msgstr "malkongruo de tempostampoj"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 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,335 +3552,335 @@ msgstr "Nenia helpo disponata"
 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:1998 g10/import.c:3146
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "�losilo %08lX: sekreta �losilo importita\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, 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:2801
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
@@ -3886,198 +3893,198 @@ msgstr "eraro dum sendo al '%s': %s\n"
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, 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:3138 g10/import.c:3177
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, fuzzy, c-format
 msgid "reason for revocation: "
 msgstr "Kialo por revoko: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, fuzzy, c-format
 msgid "revocation comment: "
 msgstr "Komento pri revoko: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, 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:3788
 #, 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:3812
 #, 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:3825
 #, 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:3840
 #, 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:3887
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:3841
+#: g10/import.c:3914
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4482
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
@@ -4115,7 +4122,7 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "Uzantidentigilo \"%s\" estas revokita.\n"
 msgstr[1] "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/key-check.c:726 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 +4130,7 @@ msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr[0] "1 subskribo ne kontrolita pro manko de �losilo\n"
 msgstr[1] "1 subskribo ne kontrolita pro manko de �losilo\n"
 
-#: g10/key-check.c:734 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"
@@ -4177,15 +4184,15 @@ msgstr "eraro dum kreado de '%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[revocation]"
 msgstr "[revoko]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[mem-subskribo]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4198,69 +4205,69 @@ msgstr ""
 "kontrolante fingrospurojn el diversaj fontoj ...)?\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 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:390 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:408
 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:425
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 #, 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, 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:646
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Ĉu vere subskribi? "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, fuzzy, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4271,7 +4278,7 @@ msgstr ""
 "\n"
 "Ĉu vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 #, fuzzy
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
@@ -4280,7 +4287,7 @@ msgstr ""
 "\n"
 "Ĉu vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:697
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4291,12 +4298,12 @@ msgstr ""
 "\n"
 "Ĉu vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 #, 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:723
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4307,7 +4314,7 @@ msgstr ""
 "\n"
 "Ĉu vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 #, fuzzy
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
@@ -4316,41 +4323,41 @@ msgstr ""
 "\n"
 "Ĉu vi volas igi �in plena eksportebla subskribo?\n"
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:748
 #, 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:752
 #, 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:758
 #, 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "Ĉi tiu �losilo eksvalidi�is!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 #, 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4359,32 +4366,32 @@ msgstr ""
 "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:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Mi ne respondas.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, 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:878
 #, 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:881
 #, 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:888
 #, fuzzy
 msgid "Your selection? (enter '?' for more information): "
 msgstr " i = bonvolu montri pli da informoj\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4393,274 +4400,274 @@ msgstr ""
 "Ĉu vi estas tute certa, ke vi volas subskribi ĉi tiun �losilon\n"
 "per via �losilo: \""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, 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:928
 #, 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:935
 #, 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:945
 #, 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:952
 #, 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:959
 #, 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:964
 #, 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:969
 #, 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:981
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Ĉu vere subskribi? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Subskribo-notacio: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 #, fuzzy
 msgid "select subkey N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 #, fuzzy
 msgid "check signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, 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:1289
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "forvi�i uzantidentigilon"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 #, fuzzy
 msgid "add a subkey"
 msgstr "al"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 #, fuzzy
 msgid "add a revocation key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 #, 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:1314
 #, 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:1316
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marku uzantidentigilon kiel ĉefan"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 #, 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:1325
 #, 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:1327
 #, 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:1329
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Ĉu vere forigi ĉiujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 #, fuzzy
 msgid "enable key"
 msgstr "�alti �losilon"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 #, fuzzy
 msgid "disable key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "montri foto-identigilon"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1349
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1470
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 #, 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:1574
 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:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4668,346 +4675,330 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 #, fuzzy
 msgid "Key is revoked."
 msgstr "Åœlosilo estas revokita.\n"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 #, fuzzy
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Ĉu vere subskribi ĉiujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1682
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Ĉu vere subskribi ĉiujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1690
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Ĉu vere forigi ĉiujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 #, 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:1814 g10/keyedit.c:1854
 #, 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vi devas elekti almenaŭ unu �losilon.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, fuzzy, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, 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:1969
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almenaŭ unu �losilon.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1975
 #, 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:1977
 #, 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:2015
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Ĉu vere forigi ĉiujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Ĉu vere forigi ĉi tiun uzantidentigilon? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2034
 #, 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:2045
 #, 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:2047
 #, 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:2105
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2150
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 #, 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:2159
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Ĉu vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Ĉu skribi �an�ojn? "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ĉu fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Ŝlosilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:2557
+#: g10/keyedit.c:2558
 #, 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:2583
+#: g10/keyedit.c:2584
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2677
+#: g10/keyedit.c:2717
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, 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:3211
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr ""
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr ""
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 #, fuzzy
 msgid "Notations: "
 msgstr "Notacio: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Ĉi tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, 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:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5016,36 +5007,36 @@ msgstr ""
 "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:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 #, 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:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Ĉu forvi�i ĉi tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Ĉu forvi�i ĉi tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Ĉu forvi�i ĉi tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Ĉu vere forvi�i ĉi tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5053,37 +5044,37 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Forvi�is %d subskribon.\n"
 msgstr[1] "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "nevalida"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Uzantidentigilo \"%s\" estas revokita.\n"
 msgstr[1] "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -5093,226 +5084,226 @@ msgstr ""
 "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:4614
+#: g10/keyedit.c:4506
 #, 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:4631
+#: g10/keyedit.c:4523
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4673
+#: g10/keyedit.c:4565
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4611
 #, 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:4788
+#: g10/keyedit.c:4680
 #, 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:4793
+#: g10/keyedit.c:4685
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ŝan�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 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:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Ŝan�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 #, 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:5033
+#: g10/keyedit.c:4925
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:5039
+#: g10/keyedit.c:4931
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 #, 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:5451
+#: g10/keyedit.c:5345
 #, 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:5516
+#: g10/keyedit.c:5410
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ĉu surskribi (j/N)? "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 #, 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:6078
+#: g10/keyedit.c:5972
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:6167
+#: g10/keyedit.c:6061
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ĉu vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:6426
+#: g10/keyedit.c:6320
 #, 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:6464
+#: g10/keyedit.c:6358
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5352,53 +5343,53 @@ msgstr "tro da '%c'-preferoj\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "nevalida signo en signoĉeno\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, fuzzy, c-format
 msgid "writing direct signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "skribas mem-subskribon\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "skribas �losilbindan subskribon\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 #, fuzzy
 msgid "Sign"
 msgstr "subskribi"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 #, fuzzy
 msgid "Encrypt"
 msgstr "ĉifri datenojn"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr ""
 
@@ -5412,179 +5403,179 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (nur ĉifri)\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, 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:2136
+#: g10/keygen.c:2113
 #, 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:2142
+#: g10/keygen.c:2119
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (nur ĉifri)\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, 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:2150
+#: g10/keygen.c:2127
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, 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:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 #, fuzzy
 msgid " *default*"
 msgstr "malĉifri datenojn (implicita elekto)"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, 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:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) RSA (nur ĉifri)\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 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:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "mal�alti �losilon"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, 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:2570
+#: g10/keygen.c:2547
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2555
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:2641
+#: g10/keygen.c:2618
 #, 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:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5600,7 +5591,7 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5616,40 +5607,40 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Åœlosilo validu ...? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Åœlosilo validu por ...? (0) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s eksvalidi�os je %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5657,12 +5648,12 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ĉu tio estas �usta (j/n)? "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5673,7 +5664,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 #, fuzzy
 msgid ""
 "\n"
@@ -5689,42 +5680,42 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, 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:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5735,11 +5726,11 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5754,35 +5745,35 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 #, 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:3148
+#: g10/keygen.c:3125
 #, 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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 +5785,18 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufiĉe da entropio.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5813,67 +5804,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Ĉu tamen uzi ĉi tiun �losilon? "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "Ĉu tamen uzi ĉi tiun �losilon? "
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, 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:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, 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:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5882,7 +5873,7 @@ msgstr ""
 "Notu, ke ĉi tiu �losilo ne estas uzebla por ĉifrado. Vi eble volos\n"
 "uzi la komandon \"--edit-key\" por krei flankan �losilon por tiu celo.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5890,7 +5881,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo aŭ "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5898,23 +5889,23 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo aŭ "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ĉu vere krei? "
@@ -5923,29 +5914,45 @@ msgstr "Ĉu vere krei? "
 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 +5960,7 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d malbonaj subskriboj\n"
 msgstr[1] "%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 +5968,45 @@ msgid_plural "%d signatures not checked due to errors\n"
 msgstr[0] "1 subskribo ne kontrolita pro eraro\n"
 msgstr[1] "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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Åœlosilaro"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 #, fuzzy
 msgid "Primary key fingerprint:"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 #, 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:2127
+#: g10/keylist.c:2373
 #, fuzzy
 msgid " Primary key fingerprint:"
 msgstr "     Åœlosilo-fingrospuro ="
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 #, fuzzy
 msgid "      Subkey fingerprint:"
 msgstr "     Åœlosilo-fingrospuro ="
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Åœlosilo-fingrospuro ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -6375,7 +6382,7 @@ msgstr "ĉefa"
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
@@ -6514,27 +6521,27 @@ msgstr "ne traktita"
 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:1614
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "nekonata klaso de subskribo"
@@ -6654,7 +6661,7 @@ msgid ""
 "%s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6663,77 +6670,77 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:100
+#: g10/photoid.c:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, 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:239
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:241
 #, 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:257
 #, 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:276
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Ĉu tio estas �usta (j/n)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/photoid.c:486
+#: g10/photoid.c:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, fuzzy, c-format
 msgid "unable to display photo ID!\n"
 msgstr "ne povas malfermi %s: %s\n"
@@ -7063,12 +7070,12 @@ msgstr "nekonata implicita ricevonto '%s'\n"
 msgid "no valid addressees\n"
 msgstr "mankas validaj adresitoj\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
@@ -8108,7 +8115,7 @@ msgstr ""
 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"
@@ -8138,37 +8145,37 @@ msgstr ""
 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"
 msgstr[0] "%lu �losiloj jam traktitaj\n"
 msgstr[1] "%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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: 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"
@@ -8294,7 +8301,7 @@ msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8302,7 +8309,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8338,7 +8345,7 @@ msgstr "�an�i la pasfrazon"
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "Kialo por revoko: "
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8424,75 +8431,75 @@ msgstr[1] "Kreado de �losiloj malsukcesis: %s\n"
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-nks.c:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1654
+#: 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:1701
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2074
+#: 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:2082
+#: 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:2092
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2102
+#: 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:2104
+#: 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:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -8758,13 +8765,13 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8773,11 +8780,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:199 sm/certchain.c:2211
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 #, fuzzy
 msgid "shell"
 msgstr "helpo"
@@ -8801,248 +8808,248 @@ msgstr ""
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, 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:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:818
 #, 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:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, 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:1260 sm/certchain.c:1264
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "�losilo %08lX: �losilo estas revokita!\n"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, fuzzy, c-format
 msgid "certificate not yet valid"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 #, fuzzy
 msgid "root certificate not yet valid"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1338 sm/certchain.c:1423
 #, fuzzy
 msgid "intermediate certificate not yet valid"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1404
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "problemo ĉe legado de atestilo: %s\n"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "            novaj subskriboj: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Fingrospuro:"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, 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:1505
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1511
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Bona atestilo"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1785 dirmngr/validate.c:576
 #, 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:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, fuzzy, c-format
 msgid "certificate chain too long\n"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1844 dirmngr/validate.c:643
 #, fuzzy, c-format
 msgid "issuer certificate not found"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "kontroli subskribon"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1911 dirmngr/validate.c:693
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "Valida atestilrevoko"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "ripetita atestilo - forvi�ita"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, 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:2198
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9065,7 +9072,7 @@ msgstr "ne traktita"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "ne"
@@ -9101,42 +9108,42 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "bad certificate"
 msgid "looking for another certificate\n"
@@ -9697,7 +9704,7 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n"
@@ -9888,7 +9895,7 @@ msgstr "forvi�o de �losilbloko malsukcesis: %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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -10137,201 +10144,201 @@ msgstr "nevalida kompendi-metodo '%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1849 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:1923
 #, fuzzy, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1938
 #, 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:1945
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, 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:1984
 #, 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:2011
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "Bona atestilo"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, 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:2084
 #, 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:2226
 #, 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:2233
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, 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:2301
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "skribas al '%s'\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2308
 #, 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:2333
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, 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:2414
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2460
 #, 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:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 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:2523
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, 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:2558
 #, 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:2569
 #, 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:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, 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:2779
+#: dirmngr/crlcache.c:2780
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
@@ -10694,12 +10701,12 @@ msgstr "uzado: gpg [opcioj] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
@@ -10948,92 +10955,92 @@ msgstr "�an�o de permesoj de '%s' malsukcesis: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:582
+#: 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:598 dirmngr/ocsp.c:782
+#: 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:642
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "Valida atestilrevoko"
 
-#: dirmngr/ocsp.c:691
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:698
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "Bona atestilo"
 
-#: dirmngr/ocsp.c:708
+#: 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:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:753
+#: 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:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:765
+#: dirmngr/ocsp.c:777
 #, fuzzy, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: dirmngr/ocsp.c:822
+#: 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:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11047,64 +11054,64 @@ msgstr "subskribado malsukcesis: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, 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:1776
 #, 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:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, 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:3062
+#: dirmngr/server.c:3078
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: dirmngr/server.c:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11423,88 +11430,101 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: 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:3706
+#: 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:3707
+#: tools/gpg-card.c:3765
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: tools/gpg-card.c:3708
+#: tools/gpg-card.c:3766
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: tools/gpg-card.c:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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"
 
@@ -13005,9 +13025,6 @@ msgstr ""
 #~ msgid "delete signatures"
 #~ msgstr "forvi�i subskribojn"
 
-#~ msgid "set preference list"
-#~ msgstr "agordi liston de preferoj"
-
 #~ msgid "updated preferences"
 #~ msgstr "aktualigitaj preferoj"
 
diff --git a/po/es.gmo b/po/es.gmo
index c528125..e5bbe17 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 0c76f5e..ec0c401 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.9\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2018-05-25 15:44+0000\n"
 "Last-Translator: emma peel <emma.peel@riseup.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -156,8 +156,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Frase contraseña:"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "no coincide - reinténtelo"
 
@@ -215,17 +215,17 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, 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:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Por favor vuelva a introducir frase contraseña"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -236,7 +236,7 @@ msgid ""
 msgstr ""
 "Introduzca la frase contraseña para proteger el objeto importado en GnuPG."
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -247,25 +247,25 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "no se puede abrir '%s': %s\n"
@@ -275,12 +275,12 @@ msgstr "no se puede abrir '%s': %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "no se encuentra una clave de tarjeta adecuada: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "error intentando obtener lista de tarjetas: %s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -289,21 +289,21 @@ msgstr ""
 "Un proceso ssh requirió el uso de la clave%%0A  %s%%0A  (%s)%%0A¿Quiere "
 "permitirlo?"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Permitir"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Denegar"
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -312,7 +312,7 @@ msgstr ""
 "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:3797
+#: agent/command-ssh.c:3837
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "fallo al crear un flujo desde el socket: %s\n"
@@ -444,166 +444,172 @@ msgstr "Por favor introduzca frase contraseña para%0Aproteger su nueva clave"
 msgid "Please enter the new passphrase"
 msgstr "Por favor escriba la nueva frase contraseña"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Opciones útiles para el depurado"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr "ejecutar en modo demonio (segundo plano)"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr "ejecutar en modo servidor (primer plano)"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "no independizarse de la consola"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr "salida de datos estilo sh"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr "salida de datos estilo csh"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|lee opciones desde FICHERO"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr "Opciones que controlan la salida de diagnósticos"
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "prolijo"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "algo más discreto"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|escribir logs en modo servidor en FICHERO"
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr "Opciones que controlan la configuración"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 msgid "do not use the SCdaemon"
 msgstr "no usar SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|usar PCM como programa SCdaemon"
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 #, 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:215
+#: agent/gpg-agent.c:216
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|aceptar algunos comandos via NAME"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr "ignorar peticiones de cambiar el TTY"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr "ignorar peticiones de cambiar el display X"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 msgid "enable ssh support"
 msgstr "permitir soporte de ssh-agent"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|usar ALGO para mostrar las huellas digitales de ssh"
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 msgid "enable putty support"
 msgstr "habilitar soporte de putty"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "habilitar soporte de putty"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "Opciones que controlan la seguridad"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|los PINs en la caché expiran en N segundos"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|las claves SSH caducan en N segundos"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 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:248
+#: agent/gpg-agent.c:256
 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:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr "no usar el caché de PINs al firmar"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 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:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "no permitir que los clientes marquen claves como \"confiables\""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 msgid "allow presetting passphrase"
 msgstr "permitir preestablecer frase contraseña"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr "Opciones que fuerzan una política de frases contraseña"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr "no permitir evitar la política de frases contraseña"
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 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:271
+#: agent/gpg-agent.c:279
 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:274
+#: agent/gpg-agent.c:282
 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:278
+#: agent/gpg-agent.c:286
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|frase contraseña caduca tras N días"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 msgid "do not allow the reuse of old passphrases"
 msgstr "no permite reusar antiguas frases contraseña"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
@@ -611,50 +617,50 @@ msgstr "Opciones que controlan la seguridad"
 
 # usa
 # Vale.
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "usa el agente gpg"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr "no permitir que el caller cambie la entrada de pin"
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 #, 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:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|usar PGM como el programa para entrada de PIN"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|establecer vida máxima de Pinentry en N segundos"
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: 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:570
+#: agent/gpg-agent.c:582
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uso: @GPG_AGENT@ [opciones] (-h para ayuda)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -662,136 +668,136 @@ msgstr ""
 "Sintaxis: @GPG_AGENT@ [opciones] [orden [argumentos]]\n"
 "Manejo de claves privadas por @GNUPG@\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, 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:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inválido\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "leyendo opciones de '%s'\n"
 
-#: agent/gpg-agent.c:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATENCIÓN: \"%s\" es una opción obsoleta\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "no se puede crear el socket: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "el nombre de socket '%s' es demasiado largo\n"
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error obteniendo valor único para el socket\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error enlazando el socket con '%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, 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:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "escuchando en el socket '%s'\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "no se puede crear el directorio '%s': %s\n"
 
-#: agent/gpg-agent.c:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "creado el directorio '%s'\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() falló para '%s': %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "no puede usar '%s' como directorio personal\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, 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:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "manejador 0x%lx para descriptor %d iniciado\n"
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, 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:2853
+#: agent/gpg-agent.c:2967
 #, 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:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, 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:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s detenido\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1069,7 +1075,7 @@ msgstr "la comprobación de la firma creada falló: %s\n"
 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:1602
 #, 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"
@@ -1084,52 +1090,52 @@ msgstr "el algoritmo de protección %d (%s) no se puede usar\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1159,18 +1165,18 @@ msgstr "Aviso: propiedad insegura de %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Aviso: permisos inseguros en %s \"%s\"\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "esperando que el archivo '%s' esté disponible ...\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "sí|si"
 
@@ -1224,8 +1230,8 @@ msgstr "agotado núcleo de memoria segura reservando %lu bytes"
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1245,75 +1251,75 @@ msgstr "ATENCIÓN: \"%s%s\" es una opción obsoleta - no tiene efecto\n"
 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:432 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"
@@ -1461,11 +1467,11 @@ msgstr "Cadena de certificados válida"
 msgid "Root certificate trustworthy"
 msgstr "Certificado raíz fiable"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 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:1115 sm/certchain.c:1284
 msgid "the available CRL is too old"
 msgstr "el CRL disponible es demasiado antiguo"
 
@@ -1502,7 +1508,7 @@ msgstr "No hay ayuda disponible para '%s'."
 msgid "ignoring garbage line"
 msgstr "ignorando línea con basura"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "[none]"
 msgstr "[ninguno]"
 
@@ -1546,36 +1552,36 @@ msgstr "iconv_open falló: %s\n"
 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
 #, 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"
@@ -1585,92 +1591,92 @@ msgstr "esperando al bloqueo %s...\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
 
-#: g10/armor.c:441
+#: 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"
@@ -1678,12 +1684,12 @@ msgstr ""
 "caracter \"quoted printable\" en la armadura - probablemente se usó\n"
 "un MTA defectuoso\n"
 
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, c-format
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "[ ilegible (%zu bytes: %s%s) ]"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1692,33 +1698,33 @@ msgstr ""
 "un nombre de notación debe tener sólo caracteres imprimibles o espacios, y "
 "acabar con un '='\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, 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:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, 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:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATENCIÓN: encontrados datos de notación inválidos\n"
@@ -1732,7 +1738,7 @@ msgstr "fallo al hacer la petición proxy %s al cliente\n"
 msgid "Enter passphrase: "
 msgstr "Introduzca la frase contraseña: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 g10/sign.c:473
 #: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
@@ -1750,7 +1756,7 @@ msgstr "error al leer de %s: %s\n"
 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:2330
+#: 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"
@@ -1795,170 +1801,170 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "genera un certificado de revocación"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "forzado"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 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:1500
+#: g10/card-util.c:803 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:1502
+#: g10/card-util.c:805 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:1535
+#: g10/card-util.c:823 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:1536
+#: g10/card-util.c:825 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:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 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:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Datos privados: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Preferencias de idioma: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 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:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "Huella digital CA: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 msgid "not an OpenPGP card"
 msgstr "no es una tarjeta OpenPGP"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr "¿Reemplazar la clave existente? (s/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 tools/gpg-card.c:3363
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1974,100 +1980,100 @@ msgstr ""
 "      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:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 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:1472
 msgid "Signature key\n"
 msgstr "Clave de firmado\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 msgid "Encryption key\n"
 msgstr "Clave de cifrado\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr "Clave de autentificación\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Elección inválida.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 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:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2078,184 +2084,184 @@ msgstr ""
 "   PIN = '%s'     PIN Administrador = '%s'\n"
 "Debería cambiarlos usando la orden --change-pin\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 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:1743 g10/card-util.c:1833
 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:1744 g10/card-util.c:1835
 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:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificación\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 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:1876
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD fallido: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 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:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "salir de este menú"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr "ver órdenes de administrador"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 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:3687
+#: g10/card-util.c:2260 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:3688
+#: g10/card-util.c:2261 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:3689
+#: g10/card-util.c:2262 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:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "cambiar nombre de usuario"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "cambiar preferencias de idioma"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 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:3694
+#: g10/card-util.c:2267 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:3695
+#: g10/card-util.c:2268 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:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "generar nuevas claves"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 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:3698
+#: g10/card-util.c:2271 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:3699
+#: g10/card-util.c:2272 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:3703
+#: g10/card-util.c:2273 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:2275
 #, 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:2276
 msgid "change the key attribute"
 msgstr "cambia valores de la clave"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/tarjeta> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 msgid "Admin-only command\n"
 msgstr "Órdenes sólo de administrador\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr "Se permiten órdenes de administrador\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2313,9 +2319,9 @@ msgstr "clave"
 msgid "subkey"
 msgstr "subclave"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualización fallida: %s\n"
@@ -2348,19 +2354,19 @@ msgstr ""
 "AVISO: forzar el cifrado simétrico %s (%d) viola las preferencias\n"
 "del destinatario\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, 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"
@@ -2372,44 +2378,45 @@ msgstr ""
 "ATENCIÓN: la clave %s no es adecuada para la encriptación en modo %s\n"
 "\n"
 
-#: g10/encrypt.c:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error al crear frase contraseña: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "usando cifrado %s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s' ya está comprimido\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "ATENCIÓN '%s' es un fichero vacío\n"
 
-#: g10/encrypt.c:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, 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:862
+#: g10/encrypt.c:853
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "leyendo desde '%s'\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2418,13 +2425,13 @@ msgstr ""
 "AVISO: forzar el algoritmo de compresión %s (%d) va en contra\n"
 "de las preferencias del receptor\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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"
@@ -2452,61 +2459,73 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCIÓN: no se ha exportado nada\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2570,7 +2589,7 @@ msgstr "Clave %s inválida hecha válida mediante --allow-non-selfsigned-uid\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando subclave %s en vez de clave primaria %s\n"
 
-#: g10/getkey.c:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "parámetros válidos para la opción '%s':\n"
@@ -2643,113 +2662,113 @@ msgstr "revoca una id de usuario en modo rápido"
 msgid "quickly set a new expiration date"
 msgstr "cambia la fecha de caducidad de modo rápido"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr "generación de claves con todas las funcionalidades"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocación"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo público"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "quickly sign a key"
 msgstr "firma una clave en modo rápido"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 msgid "quickly sign a key locally"
 msgstr "firma una clave localmente en modo rápido"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, 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:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "cambia una frase contraseña"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr "escribir estado de la tarjeta"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr "cambiar datos en la tarjeta"
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr "cambiar el PIN de la tarjeta"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 msgid "print message digests"
 msgstr "imprime resúmenes de mensaje"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "ejecutar en modo servidor"
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|decide la política TOFU de una clave"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|usa NOMBRE como clave secreta por defecto"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|cifra para el ususario NOMBRE también"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|establecer alias de email"
 
@@ -2765,61 +2784,61 @@ msgstr "no hace ningún cambio"
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Opciones que controlan la seguridad"
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Opciones que controlan la salida de diagnósticos"
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|volcar salida en FICHERO"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "usa modo de texto canónico"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nivel de compresión N (0 desactiva)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 #, 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:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|usa MECANISMOS para encontrar claves por emails"
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 #, 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:781
+#: g10/gpg.c:780
 #, 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:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "prohibir todo acceso al dirmngr"
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2851,7 +2870,7 @@ msgstr ""
 # 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:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2859,7 +2878,7 @@ msgstr ""
 "@\n"
 "(Véase en la página del manual la lista completo de órdenes y opciones)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2879,11 +2898,11 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Uso: @GPG@ [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1172
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2893,7 +2912,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operación por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2901,73 +2920,73 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Clave pública: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Compresión: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uso: %s [opciones] %s\n"
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "órdenes incompatibles\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, 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:1708
+#: g10/gpg.c:1698
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal '%s'\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, 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:1714
+#: g10/gpg.c:1704
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVISO: propiedad insegura de la extensión '%s'\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal '%s'\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, 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:1726
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVISO: permisos inseguros de la extensión '%s'\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, 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:1735
+#: g10/gpg.c:1725
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2975,18 +2994,18 @@ msgstr ""
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuración '%s'\n"
 
-#: g10/gpg.c:1738
+#: g10/gpg.c:1728
 #, 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:1744
+#: g10/gpg.c:1734
 #, 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:1747
+#: g10/gpg.c:1737
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2994,451 +3013,439 @@ msgstr ""
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuración '%s'\n"
 
-#: g10/gpg.c:1750
+#: g10/gpg.c:1740
 #, 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:1966
+#: g10/gpg.c:1956
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "artículo de configuración desconocido '%s'\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr "mostrar foto IDs al listar claves"
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 msgid "show key usage information during key listings"
 msgstr "mostrar información de uso de las claves al listarlas"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr "mostrar URLS de política al listar firmas"
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 msgid "show all notations during signature listings"
 msgstr "mostrar todas las notaciones al listar firmas"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr "mostrar notaciones estándar IETF al listar firmas"
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr "mostrar notaciones personalizadas al listar firmas"
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "mostrar URL del servidor de claves preferido al listar firmas"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr "mostrar validez de la ID de usuario al listar claves"
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr "mostrar subclaves revocadas y expiradas al listar claves"
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 msgid "show the keyring name in key listings"
 msgstr "mostrar nombre de los anillos de claves al listar claves"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 msgid "show expiration dates during signature listings"
 msgstr "mostrar fechas de caducidad al listar firmas"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "showpref"
+msgid "show preferences"
+msgstr "verpref"
+
+#: g10/gpg.c:2197
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "política TOFU desconocida '%s'\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(usa \"ayuda\" para listar las opciones)\n"
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "NOTA: ¡%s no es para uso normal!\n"
 
-#: g10/gpg.c:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, 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:3220
+#: g10/gpg.c:3194
 #, 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:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "modo de entrada de pin inválido '%s'\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "origen incorrecto de la consulta '%s'\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, 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:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inválidas\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inválidas\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importación inválidas\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "opciones de importación inválidas\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opción de filtro inválida: %s\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportación inválidas\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "opciones de exportación inválidas\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inválida\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr "lista de opciones inválida\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr "mostrar foto IDs al verificar firmas"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr "mostrar URLs de política al verificar firmas"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 msgid "show all notations during signature verification"
 msgstr "mostrar todas las notaciones al verificar firmas"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr "mostrar notaciones estándar IETF al verificar firmas"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr "mostrar notaciones personalizadas al verificar firmas"
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 msgid "show user ID validity during signature verification"
 msgstr "mostrar validez del ID de usuario al verificar firmas"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 msgid "show only the primary user ID in signature verification"
 msgstr "mostrar solo ID primario de usuario al verificar firmas"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificación inválidas\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr "opciones de verificación inválidas\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, 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:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "lista de auto-localización de claves inválida\n"
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "parámetro incorrecto para la opción \"%.50s\"\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, 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:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s no permitido con %s!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "AVISO: ejecutándose con hora del sistema falsificada "
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, 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:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inválido\n"
 
-#: g10/gpg.c:3952
-#, 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:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresión seleccionado es inválido\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, 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:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inválidas\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inválidas\n"
 
-#: g10/gpg.c:4015
-#, 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:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inválidas\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresión inválidas\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, 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:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s aún no funciona con %s\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, 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:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "el cifrado simétrico de '%s' falló: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, 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:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, 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:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 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:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepción del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportación de clave fallida: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "exportación como clave ssh fallida: %s\n"
 
-#: g10/gpg.c:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "búsqueda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovación al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminación de armadura fallida: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creación de armadura fallida: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo de distribución inválido '%s'\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, 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:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
@@ -3449,22 +3456,22 @@ msgstr ""
 # 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:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de política de certificado inválida\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de política inválida\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es válida\n"
@@ -3477,7 +3484,7 @@ msgstr "|FILE|tomar las claves del anillo FILE"
 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:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 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"
 
@@ -3506,157 +3513,157 @@ msgstr "Ayuda no disponible"
 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"
@@ -3665,175 +3672,175 @@ msgstr ""
 "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:1998 g10/import.c:3146
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, c-format
 msgid "key %s: %s\n"
 msgstr "clave %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr "rechazado por el filtro de importación"
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clave %s: clave nueva - omitida\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "error escribiendo anillo '%s': %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clave %s: clave secreta importada\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, 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:2801
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "clave %s: error enviando al agente: %s\n"
@@ -3846,202 +3853,202 @@ msgstr "clave %s: error enviando al agente: %s\n"
 #. * 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:2970
 #, 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:3117
 #, 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:3138 g10/import.c:3177
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "no se permite importar claves secretas\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "razón para la revocación: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "comentario a la revocación: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, 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:3788
 #, 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:3812
 #, 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:3825
 #, 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:3840
 #, 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:3887
 #, 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:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clave %s: subclave omitida\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clave %s: firma directa de clave añadida\n"
@@ -4084,14 +4091,14 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "ID de usuario \"%s\": %d firma borrada\n"
 msgstr[1] "ID de usuario \"%s\": %d firma borrada\n"
 
-#: g10/key-check.c:726 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"
 msgstr[0] "1 firma no comprobada por falta de una clave\n"
 msgstr[1] "%d firmas no comprobadas por falta de claves\n"
 
-#: g10/key-check.c:734 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"
@@ -4143,15 +4150,15 @@ msgstr "recurso de bloque de claves '%s': %s\n"
 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:262
 msgid "[revocation]"
 msgstr "[revocación]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4163,17 +4170,17 @@ msgstr ""
 "pasaportes, comprobando huellas dactilares en diferentes fuentes...)\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 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:390 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:408
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4183,50 +4190,50 @@ msgstr ""
 "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:425
 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:553
 #, 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:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID de usuario \"%s\" expirado."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, 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:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID de usuario \"%s\" puede firmarse.  "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr "¿Firmarlo? (s/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4235,11 +4242,11 @@ msgstr ""
 "La autofirma en \"%s\"\n"
 "es una firma de tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4248,11 +4255,11 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "ha expirado.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4261,43 +4268,43 @@ msgstr ""
 "Su firma actual en \"%s\"\n"
 "es una firma local.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "¡Esta clave ha caducado!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4307,31 +4314,31 @@ msgstr ""
 "firmar pertenece realmente a la persona arriba nombrada? Si no sabe que\n"
 "contestar, introduzca \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) No contesto.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, 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:878
 #, 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:881
 #, 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:888
 msgid "Your selection? (enter '?' for more information): "
 msgstr "¿Su elección? (escriba '?' para más información): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4340,228 +4347,228 @@ msgstr ""
 "¿Está realmente seguro de querer firmar esta clave\n"
 "con su clave: \"%s\" (%s)?\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 msgid "This will be a self-signature.\n"
 msgstr "Esto será una autofirma.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 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:935
 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:945
 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:952
 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:959
 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:964
 msgid "I have checked this key casually.\n"
 msgstr "He comprobado esta clave informalmente.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 msgid "I have checked this key very carefully.\n"
 msgstr "He comprobado esta clave meticulosamente.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:981
 msgid "Really sign? (y/N) "
 msgstr "¿Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 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:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 msgid "show key fingerprint"
 msgstr "muestra huella digital de la clave"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "show the keygrip"
 msgstr "mostrar el keygrip"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr "selecciona subclave N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr "comprueba firmas"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 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:1286
 msgid "sign selected user IDs locally"
 msgstr "firma localmente los IDs de usuarios elegidos"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 msgid "sign selected user IDs with a trust signature"
 msgstr "firmar IDs seleccionados con firma de confianza"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 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:1291
 msgid "add a user ID"
 msgstr "añadir un identificador de usuario"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "añadir un ID fotográfico"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr "borrar identificadores de usuario seleccionados"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr "añadir una subclave"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr "añadir clave a tarjeta"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr "mover una clave a la tarjeta"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr "mover una clave de respaldo a la tarjeta"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 msgid "delete selected subkeys"
 msgstr "borrar clave secundaria"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "añadir una clave de revocación"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 msgid "delete signatures from the selected user IDs"
 msgstr "borrar firmas de los ID seleccionados"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1314
 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:1316
 msgid "flag the selected user ID as primary"
 msgstr "marcar ID de usuario seleccionado como primario"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "mostrar preferencias (experto)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "mostrar preferencias (prolijo)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 msgid "set preference list for the selected user IDs"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1325
 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:1327
 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:1329
 msgid "change the passphrase"
 msgstr "cambia la frase contraseña"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 msgid "revoke signatures on the selected user IDs"
 msgstr "revocar firmas de los identificadores seleccionados"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 msgid "revoke selected user IDs"
 msgstr "revocar los identificadores seleccionados"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "revoke key or selected subkeys"
 msgstr "revoca clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "enable key"
 msgstr "habilita clave"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr "deshabilita clave"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr "mostrar fotos de los ID seleccionados"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 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:1349
 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:1470
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 msgid "Secret subkeys are available.\n"
 msgstr "Subclaves secretas disponibles.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1574
 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:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4572,291 +4579,275 @@ msgstr ""
 "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:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "La clave está revocada."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 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:1682
 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:1690
 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:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Use la orden '%s')\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 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:1756
 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:1814 g10/keyedit.c:1854
 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar exactamente una clave.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 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:1915
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "No se puede abrir '%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, 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:1969
 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:1975
 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:1977
 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:2015
 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:2016
 msgid "Really revoke this user ID? (y/N) "
 msgstr "¿Revocar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2034
 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:2045
 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:2047
 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:2105
 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:2150
 msgid "Set preference list to:\n"
 msgstr "Establecer lista de preferencias a:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 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:2159
 msgid "Really update the preferences? (y/N) "
 msgstr "¿Actualizar realmente las preferencias? (s/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Save changes? (y/N) "
 msgstr "¿Grabar cambios? (s/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr "¿Salir sin grabar? (s/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualización.\n"
 
-#: g10/keyedit.c:2557
+#: g10/keyedit.c:2558
 #, 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:2583
+#: g10/keyedit.c:2584
 #, 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:2646
+#: g10/keyedit.c:2647
 #, 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:2677
+#: g10/keyedit.c:2717
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" no es una huella digital\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr ""
 "\"%s\" no es la huella digital primaria\n"
 "\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Identificador de usuario '%s' no válido : %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "No matching user IDs."
 msgstr "No coincide con ningún identificador de usuario."
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "Nothing to sign.\n"
 msgstr "Nada que firmar.\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "No está firmado por usted.\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, 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:3211
+#: g10/keyedit.c:3251
 #, 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:3253
+#: g10/keyedit.c:3293
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" no es una huella digital válida\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "subclave \"%s\" no encontrada\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Resumen: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Características: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr "Sevidor de claves no-modificar"
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Servidor de claves preferido: "
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr "Notaciones: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr "(confidencial)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr "caducó: %s"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr "num. tarjeta: "
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr "confianza: %s"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr "validez: %s"
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Esta clave está deshabilitada"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4864,17 +4855,17 @@ msgstr ""
 "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:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "caducada"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4883,17 +4874,17 @@ msgstr ""
 "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:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "AVISO: Tu subclave de cifrado caduca pronto.\n"
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4902,74 +4893,74 @@ msgstr ""
 "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:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "¿Está seguro de querer añadirla? (s/N) "
 
-#: g10/keyedit.c:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 #, 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:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta firma inválida? (s/N/q)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¿Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d firma borrada.\n"
 msgstr[1] "%d firmas borradas.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "No se borró nada\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "inválida"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID de usuario \"%s\" compactado: %s\n"
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "ID de usuario \"%s\": %d firma borrada\n"
 msgstr[1] "ID de usuario \"%s\": %d firmas borradas\n"
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID de usuario \"%s\": ya minimizado\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID de usuario \"%s\" ya limpiado\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4978,41 +4969,41 @@ msgstr ""
 "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:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 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:4719
+#: g10/keyedit.c:4611
 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:4788
+#: g10/keyedit.c:4680
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -5020,171 +5011,171 @@ msgstr ""
 "¿Está seguro de querer cambiar la fecha de caducidad para multiples "
 "subclaves? (s/N) "
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 msgid "Changing usage of a subkey.\n"
 msgstr "Cambiando el uso de una subclave.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 msgid "Changing usage of the primary key.\n"
 msgstr "Cambiando uso de clave primaria.\n"
 
-#: g10/keyedit.c:5033
+#: g10/keyedit.c:4925
 #, 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:5039
+#: g10/keyedit.c:4931
 #, 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:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "¿Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "¿Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 msgid "Enter the notation: "
 msgstr "Introduzca la notación: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 msgid "Proceed? (y/N) "
 msgstr "¿Continuar? (s/N) "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, 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:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hay ID de usuario con hash %s\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No existe una subclave con ID de usuario '%s'.\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con índice %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caducó el %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¿De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:6078
+#: g10/keyedit.c:5972
 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:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "¿Crear los certificados de revocación realmente? (s/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, 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:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, 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:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, 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"
@@ -5225,33 +5216,33 @@ msgstr "demasiadas preferencias de cifrado\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "item incorrecto '%s' en cadena de preferencias\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "escribiendo firma directa\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "escribiendo autofirma\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobación de clave\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamaño de clave incorrecto; se usarán %u bits\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamaño de clave redondeado a %u bits\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5259,19 +5250,19 @@ msgstr ""
 "AVISO: ciertos programas OpenPGP no usan claves DSAcon resúmenes de este "
 "tamaño\n"
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr "Firma"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr "Certificar"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr "Autentificación"
 
@@ -5285,182 +5276,182 @@ msgstr "Autentificación"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr "FfCcAaSs"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, 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:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr "Acciones permitidas actualmente: "
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Conmutar la capacidad de firmar\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Conmutar la capacidad de cifrado\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Conmutar la capacidad de autenticación\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Acabado\n"
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, 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:2131
+#: g10/keygen.c:2108
 #, 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:2134
+#: g10/keygen.c:2111
 #, 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:2136
+#: g10/keygen.c:2113
 #, 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:2142
+#: g10/keygen.c:2119
 #, 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:2144
+#: g10/keygen.c:2121
 #, 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:2150
+#: g10/keygen.c:2127
 #, 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:2152
+#: g10/keygen.c:2129
 #, 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:2158
+#: g10/keygen.c:2135
 #, 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:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr "(por defecto)"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (sólo firmar)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, 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:2163
+#: g10/keygen.c:2140
 #, 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:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) Clave existente\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, 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:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Introduzca keygrip: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "No hay claves con ese keygrip\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 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:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Claves disponibles:\n"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:2570
+#: g10/keygen.c:2547
 #, 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:2578
+#: g10/keygen.c:2555
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "¿De qué tamaño quiere la subclave? (%u) "
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 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:2641
+#: g10/keygen.c:2618
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Seleccione el tipo de curva elíptica deseado:\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5476,7 +5467,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n años\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5492,38 +5483,38 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n años\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "¿Validez de la clave (0)? "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Clave válida ¿durante? (%s) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr "La firma nunca caduca\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5531,11 +5522,11 @@ msgstr ""
 "Su sistema no puede mostrar fechas más allá del 2038.\n"
 "Sin embargo funcionará correctamente hasta el 2106.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr "¿Es correcto? (s/n) "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5549,7 +5540,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5565,41 +5556,41 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido en el nombre\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, 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:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "Dirección de correo electrónico: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Dirección inválida\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Caracter inválido en el comentario\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Está usando el juego de caracteres '%s'.\n"
 
-#: g10/keygen.c:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5610,13 +5601,13 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr "¡Ese ID de usuario ya existe en esta clave!\n"
 
@@ -5631,31 +5622,31 @@ msgstr "¡Ese ID de usuario ya existe en esta clave!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "¿Cambia (N)ombre, (D)irección o (S)alir? "
 
-#: g10/keygen.c:3148
+#: g10/keygen.c:3125
 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5668,18 +5659,18 @@ msgstr ""
 "generador de números aleatorios mayor oportunidad de recoger suficiente\n"
 "entropía.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creación de la clave fallida: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5690,64 +5681,64 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr "¿Continuar? (S/n) "
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Ya existe una clave para \"%s\"\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 msgid "Create anyway? (y/N) "
 msgstr "¿Crear de todas formas?(s/N) "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, c-format
 msgid "creating anyway\n"
 msgstr "creando de todas formas\n"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, 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:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Creación de claves cancelada.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, 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:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "escribiendo clave pública en '%s'\n"
 
-#: g10/keygen.c:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo público de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, 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:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "claves pública y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 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"
@@ -5755,7 +5746,7 @@ msgstr ""
 "Tenga en cuenta que esta clave no puede ser usada para cifrar. Puede usar\n"
 "la orden \"--edit-key\" para crear una subclave con este propósito.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5763,7 +5754,7 @@ msgstr ""
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5771,23 +5762,23 @@ msgstr ""
 "clave pública creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr "¿Crear de verdad? (s/N) "
 
@@ -5795,74 +5786,90 @@ msgstr "¿Crear de verdad? (s/N) "
 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"
 msgstr[0] "%d firma correcta\n"
 msgstr[1] "%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"
 msgstr[0] "1 firma no comprobada por causa de un error\n"
 msgstr[1] "%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"
 msgstr[0] "Advertencia: clave %lu no usada por su gran tamaño\n"
 msgstr[1] "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:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Huellas dactilares de la clave primaria:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr " Huella clave primaria:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "      Huella de subclave:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr "      Huella de clave ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr "      Número de serie de la tarjeta ="
 
@@ -6234,7 +6241,7 @@ msgstr "binaria"
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "desconocido"
 
@@ -6372,28 +6379,28 @@ msgstr "Sin comprimir"
 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:1614
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "opción ambigua '%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "opción desconocida '%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "algoritmo débil de resumen desconocido '%s'\n"
@@ -6514,7 +6521,7 @@ msgstr ""
 "creada el %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6528,71 +6535,71 @@ msgstr ""
 "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:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduzca nombre del fichero JPEG para ID fotográfico: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, 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:239
 #, 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:241
 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:257
 #, 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:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "¿Es correcta la foto? (s/n) "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "no es posible ejecutar programas remotos\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "el programa externo finalizó anormalmente\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6600,7 +6607,7 @@ msgstr ""
 "llamadas a programas externos inhabilitadas por permisos inseguros de "
 "ficheros.\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "¡no puedo mostrar ID fotográfico!\n"
@@ -6939,12 +6946,12 @@ msgstr "desconocido el destinatario predefinido \"%s\"\n"
 msgid "no valid addressees\n"
 msgstr "no hay direcciones válidas\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Nota: la clave %s no usa %s\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Nota: clave %s no tiene preferencias para %s\n"
@@ -8016,7 +8023,7 @@ msgstr "usando %s como modelo de confianza\n"
 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"
@@ -8050,31 +8057,31 @@ msgstr "por favor haga un --check-trustdb\n"
 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"
 msgstr[0] "%d clave procesada"
 msgstr[1] "%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"
 msgstr[0] " (%d validación de cuenta borrada)\n"
 msgstr[1] " (%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"
@@ -8082,7 +8089,7 @@ msgstr ""
 "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 ""
@@ -8209,7 +8216,7 @@ msgstr ""
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8217,7 +8224,7 @@ msgstr "%sNúmero: %s%%0ATitular: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8260,7 +8267,7 @@ msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr ""
 "|P|Por favor introduzca PIN Unblocking Code (PUK) para claves estándar."
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8347,59 +8354,59 @@ msgstr[1] "generación de clave completada (%d segundos)\n"
 msgid "response does not contain the public key data\n"
 msgstr "la respuesta no incluye la clave pública\n"
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Por favor introduzca PIN de Administrador"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 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:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, 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:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, 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:1654
+#: 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:1701
+#: 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:2074
+#: 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:2082
+#: 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:2092
+#: 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:2102
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8407,7 +8414,7 @@ msgstr ""
 "|NP|Por favor introduzca un nuevo PIN Unblocking Code (PUK) para la clave "
 "que crea firmas cualificadas."
 
-#: scd/app-nks.c:2104
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8415,7 +8422,7 @@ msgstr ""
 "|P|Introduzca el PIN Unblocking Code (PUK) para que la clave pueda crear "
 "firmas cualificadas."
 
-#: scd/app-nks.c:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error obteniendo nuevo PIN: %s\n"
@@ -8674,13 +8681,13 @@ msgstr "manejador del descriptor %d iniciado\n"
 msgid "handler for fd %d terminated\n"
 msgstr "manejador del descriptor %d terminado\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8689,11 +8696,11 @@ msgstr ""
 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:199 sm/certchain.c:2211
 msgid "chain"
 msgstr "cadena"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 msgid "shell"
 msgstr "shell"
 
@@ -8716,235 +8723,235 @@ msgstr "política marcada como crítica sin políticas configuradas"
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "fallo obteniendo huella digital\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, 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:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "numero de emisores coincidentes: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, 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:818
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "número de certificados coincidentes: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "fallo al reservar handle de keyDB\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1260 sm/certchain.c:1264
 msgid "certificate has been revoked"
 msgstr "el certificado ha sido revocado"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr "el estado del certificado es desconocido"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, 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:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, 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:1337 sm/certchain.c:1422
 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:1338 sm/certchain.c:1423
 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:1351 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr "certificado caducado"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 msgid "root certificate has expired"
 msgstr "el certificado raíz ha caducado"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 msgid "intermediate certificate has expired"
 msgstr "el certificado intermedio ha caducado"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, 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:1404
 msgid "certificate with invalid validity"
 msgstr "el certificado tiene una validez incorrecta"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 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:1443
 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:1444
 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:1448
 #, c-format
 msgid "  (  signature created at "
 msgstr "  ( firmas creadas en "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certificado creado en "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certificado válido desde "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     emisor válido desde "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "huella digital=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, 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:1505
 #, 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:1511
 #, 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:1570
 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:1634
 msgid "no issuer found in certificate"
 msgstr "no se encuentra el emisor de este certificado"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 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:1785 dirmngr/validate.c:576
 #, 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:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, 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:1844 dirmngr/validate.c:643
 #, 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:1879 dirmngr/validate.c:669
 #, 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:1911 dirmngr/validate.c:693
 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:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr "certificado correcto\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certificado intermedio correcto\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, c-format
 msgid "root certificate is good\n"
 msgstr "certificado raíz correcto\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr "cambiando al modelo en cadena"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr "modelo de validación usado: %s"
@@ -8967,7 +8974,7 @@ msgstr "memoria desbordada\n"
 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:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "ninguno"
 
@@ -9002,42 +9009,42 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, 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:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, 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:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, 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:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, 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:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, 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:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "el certificado no es utilizable para cifrar\n"
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "el certificado no es utilizable para firmar\n"
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9597,7 +9604,7 @@ msgstr "algoritmo de hash usado para el firmante %d: %s (%s)\n"
 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:916
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
@@ -9789,7 +9796,7 @@ msgstr "removiendo archivo de cache '%s'\n"
 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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "error cerrando archivo de cache: %s\n"
@@ -10043,134 +10050,134 @@ msgstr "algoritmo hash inválido '%s'\n"
 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:1849 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:1923
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ha fallado ksba_crl_parse: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1938
 #, 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:1945
 #, 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:1949
 #, 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:1969
 #, 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:1984
 #, 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:2011
 #, 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:2026
 #, 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:2072
 #, 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:2084
 #, 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:2226
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ha fallado ksba_crl_new: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2233
 #, 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:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "ha fallado crl_parse_insert: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2301
 #, 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:2308
 #, 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:2333
 #, 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:2337
 #, 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:2353
 #, 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:2363
 #, 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:2414
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "creando fichero de cache '%s'\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, 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:2460
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10179,12 +10186,12 @@ msgstr ""
 "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:2497
 #, 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:2520
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10193,57 +10200,57 @@ msgstr ""
 "luego de una actualización!\n"
 
 # qué es una 'extensión crítica desconocida'? dice que falta?
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2523
 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:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr " ERROR: No se usará el CRL\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 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:2551
 #, 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:2558
 #, 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:2569
 #, 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:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr "Terminar el dump de CRL\n"
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "ha fallado crl_fetch via DP: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "ha fallado crl_cache_insert via DP: %s\n"
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "ha fallado crl_cache_insert via emisor: %s\n"
@@ -10597,12 +10604,12 @@ msgstr "uso: %s [opciones] "
 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:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fallo al intentar descargar CRL desde '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "falló el procesamiento CRL desde '%s': %s\n"
@@ -10850,93 +10857,93 @@ msgstr "ha fallado el hashing de la respuesta OCSP para '%s': %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "no firmada por un certificado predeterminado de firma OCSP"
 
-#: dirmngr/ocsp.c:582
+#: 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:598 dirmngr/ocsp.c:782
+#: 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:642
+#: 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:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "no se encuentra el emisor de este certificado: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: 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:698
+#: 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:708
+#: 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:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "no hay un OCSP responder predeterminado\n"
 
-#: dirmngr/ocsp.c:753
+#: 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:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "usar el contestador OCSP predeterminado '%s'\n"
 
-#: dirmngr/ocsp.c:765
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "usar OCSP responder '%s'\n"
 
-#: dirmngr/ocsp.c:822
+#: 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:847
+#: 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:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "bien"
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: 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:901
+#: 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:916
+#: 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"
@@ -10950,63 +10957,63 @@ msgstr "ha fallado assuan_inquire(%s): %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "ha fallado assuan_inquire: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "error al enviar datos: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "ha fallado start_cert_fetch: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1776
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "ha fallado fetch_next_cert: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "se ha excedido el número de respuestas(max_replies) %d\n"
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "no puedo colocar la estructura de control: %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "fallo al reservar el contexto assuan: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "ha fallado la inicialización del servidor: %s\n"
 
-#: dirmngr/server.c:3062
+#: dirmngr/server.c:3078
 #, 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:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "problema de aceptación Assuan: %s\n"
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "ha fallado el procesado Assuan: %s\n"
@@ -11329,90 +11336,105 @@ msgstr ""
 "Compara frase contraseña dada en entrada estándar con un fichero de "
 "patrones\n"
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: 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:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: 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:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "configurar KDF para autentificación de PIN"
 
-#: tools/gpg-card.c:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3707
+#: 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:3708
+#: 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:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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"
@@ -13543,9 +13565,6 @@ msgstr ""
 #~ msgid "pref"
 #~ msgstr "pref"
 
-#~ msgid "showpref"
-#~ msgstr "verpref"
-
 #~ msgid "setpref"
 #~ msgstr "estpref"
 
diff --git a/po/et.gmo b/po/et.gmo
index fc43f3e..1a83eec 100644
--- a/po/et.gmo
+++ b/po/et.gmo
diff --git a/po/et.po b/po/et.po
index aac9c52..11293fa 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -140,8 +140,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "halb parool"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
@@ -195,25 +195,25 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuda parooli"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, 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:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -224,26 +224,26 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -254,39 +254,39 @@ msgstr "`%s' ei õnnestu avada: %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "kirjutatavat salajaste võtmete hoidlat pole: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, 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:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, 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:3797
+#: agent/command-ssh.c:3837
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
@@ -417,208 +417,214 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muuda parooli"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "ole mõnevõrra vaiksem"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uuenda usalduse andmebaasi"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 #, 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:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "ei ole toetatud"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "ei ole toetatud"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "ei ole toetatud"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|kasuta parooli moodi N"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "kasuta gpg-agenti"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
@@ -626,149 +632,149 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:570
+#: agent/gpg-agent.c:582
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud lühendi algoritm ei ole lubatud\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, 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:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s ei õnnestu luua: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, 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:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: kataloogi ei õnnestu luua: %s\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2853
+#: agent/gpg-agent.c:2967
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: jätsin vahele: %s\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1030,7 +1036,7 @@ msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 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:1602
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1048,52 +1054,52 @@ msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1124,18 +1130,18 @@ msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "jah"
 
@@ -1190,8 +1196,8 @@ msgstr ""
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1211,69 +1217,69 @@ msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 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:432 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"
@@ -1441,12 +1447,12 @@ msgstr "See võti on aegunud!"
 msgid "Root certificate trustworthy"
 msgstr "halb sertifikaat"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "halb sertifikaat"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Võtme leiate: "
@@ -1488,7 +1494,7 @@ msgstr "`%s' kohta abiinfo puudub"
 msgid "ignoring garbage line"
 msgstr "viga lõpetaval real\n"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 #, fuzzy
 msgid "[none]"
 msgstr "tundmatu"
@@ -1533,36 +1539,36 @@ msgstr "faili ei õnnestu avada: %s\n"
 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
 #, 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"
@@ -1572,105 +1578,105 @@ msgstr "kirjutan salajase võtme faili `%s'\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: 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:1462
+#: g10/build-packet.c:1480
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "pole inimese poolt loetav"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1679,27 +1685,27 @@ msgstr ""
 "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:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, 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:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1709,7 +1715,7 @@ msgstr ""
 "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:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
@@ -1723,7 +1729,7 @@ msgstr ""
 msgid "Enter passphrase: "
 msgstr "Sisestage parool: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 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"
@@ -1741,7 +1747,7 @@ msgstr "viga `%s' lugemisel: %s\n"
 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:2330
+#: 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"
@@ -1784,177 +1790,177 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1500
+#: g10/card-util.c:803 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1502
+#: g10/card-util.c:805 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uuendatud eelistused"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 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:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näita sõrmejälge"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -1962,102 +1968,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 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:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2065,197 +2071,197 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 #, 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:1743 g10/card-util.c:1833
 #, 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:1744 g10/card-util.c:1835
 #, 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:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 #, 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:1876
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "välju sellest menüüst"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 #, fuzzy
 msgid "show admin commands"
 msgstr "vastuolulised käsud\n"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "näita seda abiinfot"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 tools/gpg-card.c:3743
 #, fuzzy
 msgid "list all available data"
 msgstr "Võtme leiate: "
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3689
+#: g10/card-util.c:2262 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3690
+#: g10/card-util.c:2263 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:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3694
+#: g10/card-util.c:2267 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:3695
+#: g10/card-util.c:2268 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3698
+#: g10/card-util.c:2271 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 #, 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:2276
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 #, 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, 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:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 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 +2323,9 @@ msgstr "key"
 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:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
@@ -2351,18 +2357,18 @@ msgid ""
 msgstr ""
 "sümmetrilise šifri %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, 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"
@@ -2372,47 +2378,48 @@ msgstr "Å¡ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 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:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "kasutan Å¡iffrit %s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, 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:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, 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:862
+#: g10/encrypt.c:853
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "loen failist `%s'\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2420,13 +2427,13 @@ msgid ""
 msgstr ""
 "pakkimise algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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"
@@ -2454,71 +2461,82 @@ msgstr "HOIATUS: teade on krüptitud sümmeetrilise šifri nõrga võtmega.\n"
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2589,7 +2607,7 @@ msgstr ""
 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:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "vigased impordi võtmed\n"
@@ -2673,120 +2691,120 @@ msgstr "genereeri uus võtmepaar"
 msgid "quickly set a new expiration date"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "eemalda võtmed avalike võtmete hoidlast"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "eemalda võtmed salajaste võtmete hoidlast"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "allkirjasta võti"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "allkirjasta võti lokaalselt"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "allkirjasta võti"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "allkirjasta võti lokaalselt"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "allkirjasta või toimeta võtit"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuda parooli"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "ekspordi võtmed"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "ekspordi võtmed võtmeserverisse"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "impordi võtmed võtmeserverist"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "otsi võtmeid võtmeserverist"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "uuenda võtmeid võtmeserverist"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "impordi/mesti võtmed"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [failid]|trüki teatelühendid"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NIMI|krüpti NIMEle"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
@@ -2802,56 +2820,56 @@ msgstr "ära tee mingeid muutusi"
 msgid "prompt before overwriting"
 msgstr "küsi enne ülekirjutamist"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis väljund"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|määra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "impordi võtmed võtmeserverist"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "kontrolli võtmete allkirju"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2879,7 +2897,7 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2887,7 +2905,7 @@ msgstr ""
 "@\n"
 "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2917,13 +2935,13 @@ msgstr ""
 " --list-keys [nimed]        näita võtmeid\n"
 " --fingerprint [nimed]      näita sõrmejälgi\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 #, 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:1175
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2938,7 +2956,7 @@ msgstr ""
 "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
 "vaikimisi operatsioon sõltub sisendandmetest\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2946,571 +2964,560 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Avalik võti: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Å iffer: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Räsi: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "kasuta: gpg [võtmed] "
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub sümbol =\n"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1698
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1716
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1735
+#: g10/gpg.c:1725
 #, 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:1738
+#: g10/gpg.c:1728
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1744
+#: g10/gpg.c:1734
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1747
+#: g10/gpg.c:1737
 #, 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:1750
+#: g10/gpg.c:1740
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1966
+#: g10/gpg.c:1956
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "sea eelistuste nimekiri"
+
+#: g10/gpg.c:2197
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, 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:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi võtmed\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi võtmed\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path väärtuseks ei õnnestu seada %s\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s määrab üle %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos mõtet!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, 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:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud Å¡ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3952
-#, 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:3964
+#: g10/gpg.c:3927
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud Å¡ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku Å¡ifri eelistused\n"
 
-#: g10/gpg.c:4015
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "vigased isikliku Å¡ifri eelistused\n"
-
-#: g10/gpg.c:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku lühendi eelistused\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, 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:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei tööta veel koos %s-ga\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4420
+#: g10/gpg.c:4368
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4426
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "võtme eksport ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, 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:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "võtmeserveri otsing ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/gpg.c:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage nüüd oma teade ...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -3524,7 +3531,7 @@ msgstr "võta võtmed sellest võtmehoidlast"
 msgid "make timestamp conflicts only a warning"
 msgstr "teata ajatemplite konfliktist ainult hoiatusega"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
@@ -3555,336 +3562,336 @@ msgstr "Abiinfo puudub"
 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:1998 g10/import.c:3146
 #, 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:2004
 #, 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:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, 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:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, 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:2793
 #, 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:2801
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
@@ -3897,200 +3904,200 @@ msgstr "viga teate saatmisel serverile `%s': %s\n"
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, 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:3138 g10/import.c:3177
 #, 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:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "tühistamise põhjus: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "tühistamise kommentaar: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, 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:3788
 #, 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:3812
 #, 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:3825
 #, 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:3840
 #, 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:3887
 #, 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:3914
 #, 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:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "võti %08lX: lisatud vahetu võtme allkiri\n"
@@ -4128,7 +4135,7 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "Kasutaja ID \"%s\" on tühistatud."
 msgstr[1] "Kasutaja ID \"%s\" on tühistatud."
 
-#: g10/key-check.c:726 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"
@@ -4136,7 +4143,7 @@ msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr[0] "1 allkiri jäi testimata, kuna võti puudub\n"
 msgstr[1] "1 allkiri jäi testimata, kuna võti puudub\n"
 
-#: g10/key-check.c:734 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"
@@ -4190,15 +4197,15 @@ msgstr "viga `%s' loomisel: %s\n"
 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:262
 msgid "[revocation]"
 msgstr "[tühistamine]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[iseenda allkiri]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4211,68 +4218,68 @@ msgstr ""
 "passe, kontrollige erinevatest allikatest näpujälgi...)?\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 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:390 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:408
 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:425
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kasutaja ID \"%s\" on aegunud."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, 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:646
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Kasutaja ID \"%s\" ei ole ise allkirjastatud."
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Allkirjastan tõesti? "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4281,11 +4288,11 @@ msgstr ""
 "Iseenda allkiri \"%s\"\n"
 "on PGP 2.x stiilis allkiri.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4294,11 +4301,11 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on aegunud.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4307,44 +4314,44 @@ msgstr ""
 "Teie praegune allkiri \"%s\"\n"
 "on lokaalne allkiri.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "See võti on aegunud!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4354,32 +4361,32 @@ msgstr ""
 "kuulub ka tegelikult ülal mainitud isikule? Kui te ei tea, mida vastata,\n"
 "sisestage \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Ma ei vasta.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, 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:878
 #, 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:881
 #, 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:888
 #, fuzzy
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Teie valik? (lisainfo saamiseks vajutage '?'): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4388,275 +4395,275 @@ msgstr ""
 "Olete tõesti kindel, et soovite seda võtit oma\n"
 "võtmega allkirjastada: \""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "See saab olema iseenda allkiri.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, 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:935
 #, 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:945
 #, 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:952
 #, 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:959
 #, 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:964
 #, 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:969
 #, 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:981
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan tõesti? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "salvesta ja välju"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "näita sõrmejälge"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Allkirja noteerimine: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "näita võtit ja kasutaja IDd"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 #, fuzzy
 msgid "select subkey N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 #, fuzzy
 msgid "check signatures"
 msgstr "tühista allkirjad"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allkirjasta võti lokaalselt"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "kustuta kasutaja ID"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "kustuta sekundaarne võti"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "lisa tühistamise võti"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 #, 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:1314
 #, 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:1316
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "märgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "näita eelistusi (ekspert)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "näita eelistusi (detailsena)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 #, 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:1325
 #, 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:1327
 #, 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:1329
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 #, 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:1337
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "tühista kasutaja ID"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "tühista sekundaarne võti"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 #, fuzzy
 msgid "enable key"
 msgstr "luba võti"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 #, fuzzy
 msgid "disable key"
 msgstr "blokeeri võti"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "näita foto ID"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1349
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1470
 msgid "Secret key is available.\n"
 msgstr "Salajane võti on kasutatav.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 #, 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:1574
 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:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4664,309 +4671,293 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "Võti on tühistatud."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 #, 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:1682
 #, 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:1690
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 #, 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:1756
 #, 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:1814 g10/keyedit.c:1854
 #, 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 #, 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:1894
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, fuzzy, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "`%s' ei õnnestu avada: %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, 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:1969
 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:1975
 #, 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:1977
 #, 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:2015
 #, 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:2016
 #, 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:2034
 #, 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:2045
 #, 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:2047
 #, 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:2105
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2150
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 #, 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:2159
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Kas tõesti uuendan seaded? "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Väljun salvestamata? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:2557
+#: g10/keyedit.c:2558
 #, 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:2583
+#: g10/keyedit.c:2584
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: g10/keyedit.c:2677
+#: g10/keyedit.c:2717
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "vigane väärtus\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Tundmatu kasutaja ID.\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Võtmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   allkirjastanud %08lX %s%s\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, 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:3211
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Teatelühend: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Omadused: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 #, fuzzy
 msgid "Notations: "
 msgstr "Noteering: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei õnnestu luua: %s\n"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[tühistatud] "
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "See võti on blokeeritud"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4974,19 +4965,19 @@ msgstr ""
 "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:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4995,18 +4986,18 @@ msgstr ""
 "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:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5015,35 +5006,35 @@ msgstr ""
 "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:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 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:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5051,38 +5042,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Kustutatud %d allkiri.\n"
 msgstr[1] "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Kasutaja ID \"%s\" on tühistatud."
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Kasutaja ID \"%s\" on tühistatud."
 msgstr[1] "Kasutaja ID \"%s\" on tühistatud."
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5091,41 +5082,41 @@ msgstr ""
 "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:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage määratud tühistaja kasutaja ID: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 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:4719
+#: g10/keyedit.c:4611
 #, 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:4788
+#: g10/keyedit.c:4680
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5133,181 +5124,181 @@ msgid ""
 msgstr ""
 "Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Muudan sekundaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 #, 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:5033
+#: g10/keyedit.c:4925
 #, 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:5039
+#: g10/keyedit.c:4931
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige täpselt üks kasutaja ID.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, 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:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Kirjutan üle (j/E)? "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 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:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   tühistanud %08lX %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute tühistama järgmisi allkirju:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "salajast võtit pole\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, 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:6464
+#: g10/keyedit.c:6358
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, 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"
@@ -5347,53 +5338,53 @@ msgstr "liiga palju `%c' eelistusi\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "lubamatu sümbol eelistuste sõnes\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "kirjutan otsese allkirja\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "kirjutan iseenda allkirja\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "kirjutan võtit siduva allkirja\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane võtme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "võtme suurus ümardatud üles %u bitini\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 #, fuzzy
 msgid "Encrypt"
 msgstr "krüpteeri andmed"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr ""
 
@@ -5407,179 +5398,179 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, 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:2136
+#: g10/keygen.c:2113
 #, 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:2142
+#: g10/keygen.c:2119
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (ainult krüptimiseks)\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, 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:2150
+#: g10/keygen.c:2127
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) RSA (allkirjastamiseks ja krüptimiseks)\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (vaikimisi)"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, 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:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) RSA (ainult krüpteerimiseks)\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 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:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "blokeeri võti"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, 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:2570
+#: g10/keygen.c:2547
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2555
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Millist võtmepikkust te soovite? (1024) "
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 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:2641
+#: g10/keygen.c:2618
 #, 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:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5595,7 +5586,7 @@ msgstr ""
 "      <n>m = võti aegub n kuuga\n"
 "      <n>y = võti aegub n aastaga\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5611,40 +5602,40 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Võti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "vigane väärtus\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5652,12 +5643,12 @@ msgstr ""
 "Teie süsteem ei saa esitada kuupäevi peale aastat 2038.\n"
 "Siiski käsitletakse neid korrektselt aastani 2106.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "On see õige (j/e)? "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5668,7 +5659,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 #, fuzzy
 msgid ""
 "\n"
@@ -5684,42 +5675,42 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Pärisnimi: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Lubamatu sümbol nimes\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu sümbol kommentaaris\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, 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:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5730,11 +5721,11 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5749,35 +5740,35 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 #, 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:3148
+#: g10/keygen.c:3125
 #, 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Palun parandage kõigepealt viga\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5789,18 +5780,18 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile võimaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Võtme genereerimine ebaõnnestus: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5808,67 +5799,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Kasutan seda võtit ikka? "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Võtme genereerimine katkestati.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, 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:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike võtmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, 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:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane võti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5878,35 +5869,35 @@ msgstr ""
 "Krüptimiseks tuleb genereerida teine võti, seda saate teha\n"
 "kasutades võtit \"--edit-key\".\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, 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:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, 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:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon tõesti? "
@@ -5915,27 +5906,43 @@ msgstr "Loon tõesti? "
 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"
@@ -5943,7 +5950,7 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d halba allkirja\n"
 msgstr[1] "%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"
@@ -5951,41 +5958,41 @@ msgid_plural "%d signatures not checked due to errors\n"
 msgstr[0] "1 allkiri jäi vea tõttu kontrollimata\n"
 msgstr[1] "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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Võtmehoidla"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Primaarse võtme sõrmejälg:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr " Primaarse võtme sõrmejälg:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "     Alamvõtme sõrmejälg:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Võtme sõrmejälg ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -6361,7 +6368,7 @@ msgstr "binaarne"
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "tundmatu"
 
@@ -6502,27 +6509,27 @@ msgstr "Pakkimata"
 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:1614
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "loen võtmeid failist `%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "tundmatu allkirja klass"
@@ -6645,7 +6652,7 @@ msgid ""
 "%s"
 msgstr "%u-bitine %s võti, ID %08lX, loodud %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6659,74 +6666,74 @@ msgstr ""
 "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:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Sisestage foto ID jaoks JPEG faili nimi: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, 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:239
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:241
 #, 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:257
 #, 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:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "On see foto õige (j/E/v)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "mittelokaalse programmi käivitamist ei toetata\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "väline programm lõpetas erandlikult\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6734,7 +6741,7 @@ msgstr ""
 "väliste programmide käivitamine on blokeeritud, kuna seadete failil on\n"
 "ebaturvalised õigused\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "foto ID ei saa näidata!\n"
@@ -7061,12 +7068,12 @@ msgstr "tundmatu vaikimisi saaja `%s'\n"
 msgid "no valid addressees\n"
 msgstr "kehtivaid aadresse pole\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "võti %08lX: kasutaja ID puudub\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "võti %08lX: kasutaja ID puudub\n"
@@ -8114,7 +8121,7 @@ msgstr ""
 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"
@@ -8144,14 +8151,14 @@ msgstr "palun tehke --check-trustdb\n"
 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"
 msgstr[0] "%lu võtit on seni töödeldud\n"
 msgstr[1] "%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"
@@ -8159,23 +8166,23 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d võtit töödeldud (%d kehtivust puhastatud)\n"
 msgstr[1] "%d võtit töödeldud (%d kehtivust puhastatud)\n"
 
-#: g10/trustdb.c: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"
@@ -8304,7 +8311,7 @@ msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8312,7 +8319,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8348,7 +8355,7 @@ msgstr "muuda parooli"
 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:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8434,75 +8441,75 @@ msgstr[1] "Võtme genereerimine ebaõnnestus: %s\n"
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuda parooli"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muuda parooli"
 
-#: scd/app-nks.c:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1654
+#: 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:1701
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2074
+#: scd/app-nks.c:2088
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "muuda parooli"
 
-#: scd/app-nks.c:2082
+#: 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:2092
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2102
+#: 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:2104
+#: 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:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -8767,13 +8774,13 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8782,11 +8789,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:199 sm/certchain.c:2211
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -8810,241 +8817,241 @@ msgstr ""
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:818
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1260 sm/certchain.c:1264
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "MÄRKUS: võti on tühistatud"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 #, 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:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "See võti on aegunud!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "See võti on aegunud!"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "See võti on aegunud!"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1404
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "See võti on aegunud!"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "         uusi allkirju: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "halb sertifikaat"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "näita sõrmejälge"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1505
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1511
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "kontrolli allkirja"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1911 dirmngr/validate.c:693
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "eelistus %c%lu on duplikaat\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "halb sertifikaat"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9067,7 +9074,7 @@ msgstr "ei töödeldud"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "ei"
@@ -9103,42 +9110,42 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bitti %s võti, ID %08lX, loodud %s%s\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "halb sertifikaat"
@@ -9697,7 +9704,7 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Allkirja lõi %.*s kasutades %s võtit ID %08lX\n"
@@ -9891,7 +9898,7 @@ msgstr "võtmebloki kustutamine ebaõnnestus: %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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -10141,201 +10148,201 @@ msgstr "vigane räsialgoritm `%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1849 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:1923
 #, 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:1938
 #, 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:1945
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1984
 #, 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:2011
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, 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:2084
 #, 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:2226
 #, 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:2233
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, 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:2301
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2308
 #, 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:2333
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2414
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2460
 #, 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:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 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:2523
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, 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:2558
 #, 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:2569
 #, 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:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
@@ -10697,12 +10704,12 @@ msgstr "kasuta: gpg [võtmed] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
@@ -10950,93 +10957,93 @@ msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:582
+#: 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:598 dirmngr/ocsp.c:782
+#: 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:642
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:698
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: dirmngr/ocsp.c:708
+#: 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:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:753
+#: 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:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:765
+#: 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:822
+#: 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:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11050,64 +11057,64 @@ msgstr "allkirjastamine ebaõnnestus: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, 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:1776
 #, 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:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, 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:3062
+#: dirmngr/server.c:3078
 #, 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:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11426,87 +11433,101 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Tühistamise sertifikaat on loodud.\n"
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: 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:3706
+#: 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:3707
+#: 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:3708
+#: 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:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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"
@@ -13099,9 +13120,6 @@ msgstr ""
 #~ msgid "delete signatures"
 #~ msgstr "kustuta allkirjad"
 
-#~ msgid "set preference list"
-#~ msgstr "sea eelistuste nimekiri"
-
 #~ msgid "updated preferences"
 #~ msgstr "uuendatud eelistused"
 
diff --git a/po/fi.gmo b/po/fi.gmo
index 9464212..bac3299 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
diff --git a/po/fi.po b/po/fi.po
index 5d0a89d..240d675 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -156,8 +156,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
@@ -211,25 +211,25 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, 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:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -240,26 +240,26 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -270,39 +270,39 @@ msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, 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:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, 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:3797
+#: agent/command-ssh.c:3837
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
@@ -433,208 +433,214 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "monisanainen"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "päivitä luottamustietokanta"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 #, 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:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "ei tuettu"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "ei tuettu"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "ei tuettu"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|käytä salasanoissa toimintatapaa N"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "käytä gpg-agentia"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
@@ -643,149 +649,149 @@ msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:570
+#: agent/gpg-agent.c:582
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, 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:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, 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:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, 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:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: hakemistoa ei voi luoda: %s\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2853
+#: agent/gpg-agent.c:2967
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1047,7 +1053,7 @@ msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 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:1602
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1065,52 +1071,52 @@ msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1141,18 +1147,18 @@ msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "kyllä|kylla|joo"
 
@@ -1207,8 +1213,8 @@ msgstr ""
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1228,69 +1234,69 @@ msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 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:432 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"
@@ -1458,12 +1464,12 @@ msgstr "Tämä avain on vanhentunut!"
 msgid "Root certificate trustworthy"
 msgstr "virheellinen varmenne"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "virheellinen varmenne"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Avain saatavilla kohteessa: "
@@ -1505,7 +1511,7 @@ msgstr "Ei ohjetta aiheesta \"%s\""
 msgid "ignoring garbage line"
 msgstr "virhe trailer-rivissä\n"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 #, fuzzy
 msgid "[none]"
 msgstr "tuntematon "
@@ -1550,36 +1556,36 @@ msgstr "ei voi avata tiedostoa: %s\n"
 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
 #, 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"
@@ -1589,92 +1595,92 @@ msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: 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"
@@ -1683,13 +1689,13 @@ msgstr ""
 "viallista\n"
 "MTA:ta on käytetty\n"
 
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "ei ihmisten luettavissa"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1698,27 +1704,27 @@ msgstr ""
 "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
 "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, 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:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
 
-#: g10/build-packet.c:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1728,7 +1734,7 @@ msgstr ""
 "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
 "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
 
-#: g10/build-packet.c:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
@@ -1742,7 +1748,7 @@ msgstr ""
 msgid "Enter passphrase: "
 msgstr "Syötä salasana: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 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"
@@ -1760,7 +1766,7 @@ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 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:2330
+#: 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"
@@ -1803,177 +1809,177 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Valintasi? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1500
+#: g10/card-util.c:803 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1502
+#: g10/card-util.c:805 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "päivitä valinnat"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 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:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -1981,102 +1987,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 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:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2084,197 +2090,197 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 #, 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:1743 g10/card-util.c:1833
 #, 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:1744 g10/card-util.c:1835
 #, 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:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 #, 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:1876
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 #, fuzzy
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 tools/gpg-card.c:3743
 #, fuzzy
 msgid "list all available data"
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3689
+#: g10/card-util.c:2262 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 #, fuzzy
 msgid "change the login name"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3694
+#: g10/card-util.c:2267 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:3695
+#: g10/card-util.c:2268 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 #, fuzzy
 msgid "generate new keys"
 msgstr "luo uusi avainpari"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3698
+#: g10/card-util.c:2271 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 #, 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:2276
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 #, 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, 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:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2336,9 +2342,9 @@ msgstr "key"
 msgid "subkey"
 msgstr "JulkAvain: "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
@@ -2369,18 +2375,18 @@ 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:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, 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"
@@ -2390,60 +2396,61 @@ msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/encrypt.c:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "käytetään salakirjoitusalgoritmia %s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, 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:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, 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:862
+#: g10/encrypt.c:853
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "luetaan kohteesta \"%s\"\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, 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:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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"
@@ -2473,69 +2480,80 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "VAROITUS: mitään ei viety\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2606,7 +2624,7 @@ 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:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "virheelliset tuontivalitsimet\n"
@@ -2690,120 +2708,120 @@ msgstr "luo uusi avainpari"
 msgid "quickly set a new expiration date"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten renkaasta"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "allekirjoita tai muokkaa avainta"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "päivitä kaikki avaimet avainpalvelimelta"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "nouda/liitä avaimia"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
@@ -2819,56 +2837,56 @@ msgstr "älä tee muutoksia"
 msgid "prompt before overwriting"
 msgstr "kysy ennen ylikirjoittamista"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2896,7 +2914,7 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2905,7 +2923,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2934,13 +2952,13 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 #, 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:1175
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2955,7 +2973,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2963,572 +2981,561 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, 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:1708
+#: g10/gpg.c:1698
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, 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:1714
+#: g10/gpg.c:1704
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, 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:1723
+#: g10/gpg.c:1713
 #, 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:1726
+#: g10/gpg.c:1716
 #, 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:1732
+#: g10/gpg.c:1722
 #, 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:1735
+#: g10/gpg.c:1725
 #, 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:1738
+#: g10/gpg.c:1728
 #, 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:1744
+#: g10/gpg.c:1734
 #, 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:1747
+#: g10/gpg.c:1737
 #, 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:1750
+#: g10/gpg.c:1740
 #, 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:1966
+#: g10/gpg.c:1956
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "näytä valinnat"
+
+#: g10/gpg.c:2197
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, 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:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3952
-#, 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:3964
+#: g10/gpg.c:3927
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:4015
-#, 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:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, 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:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, 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:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/gpg.c:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -3542,7 +3549,7 @@ msgstr "ota avaimet tästä avainrenkaasta"
 msgid "make timestamp conflicts only a warning"
 msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
@@ -3573,338 +3580,338 @@ msgstr "Ei ohjeita saatavilla"
 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:1998 g10/import.c:3146
 #, 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:2004
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "ohitetaan \"%s\": %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "avain %08lX: uusi avain - ohitetaan\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "avain %08lX: salainen avain tuotu\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, 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:2801
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@ -3917,202 +3924,202 @@ msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, 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:3138 g10/import.c:3177
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "mitätöinnin syy: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "mitätöintikommentti: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, 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:3788
 #, 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:3812
 #, 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:3825
 #, 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:3840
 #, 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:3887
 #, 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:3914
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "avain %08lX: aliavain ohitettu\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
@@ -4151,7 +4158,7 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "Käyttäjätunnus \"%s\" on mitätöity."
 msgstr[1] "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/key-check.c:726 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 +4166,7 @@ msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr[0] "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
 msgstr[1] "1 allekirjoitus jätetty tarkistamatta puuttuvan avaimen vuoksi\n"
 
-#: g10/key-check.c:734 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"
@@ -4213,15 +4220,15 @@ msgstr "virhe luotaessa \"%s\": %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[revocation]"
 msgstr "[mitätöinti]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[oma-allekirjoitus]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4234,68 +4241,68 @@ msgstr ""
 "lähteistä...)?\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 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:390 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:408
 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:425
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  Allekirjoittaminen ei onnistu.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Käyttäjätunnus \"%s\" on vanhentunut."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, 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:646
 #, 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:648
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4304,13 +4311,13 @@ msgstr ""
 "Oma-allekirjoitus kohteessa \"%s\"\n"
 "on PGP 2.x -muodon allekirjoitus.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4319,11 +4326,11 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on vanhentunut.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4332,44 +4339,44 @@ msgstr ""
 "Nykyinen allekirjoituksesi kohteessa \"%s\"\n"
 "on paikallinen allekirjoitus.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "Tämä avain on vanhentunut!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Avain vanhenee %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4378,32 +4385,32 @@ msgstr ""
 "Kuinka huolellisesti olet vahvistanut avaimen haltijan henkilöllisyyden?\n"
 "Jos et tiedä vastausta, syötä \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) En vastaa.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, 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:878
 #, 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:881
 #, 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:888
 #, fuzzy
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Valintasi? (syöttämällä \"?\" saat lisätietoja): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4412,275 +4419,275 @@ msgstr ""
 "Haluatko varmasti allekirjoittaa tämän avaimen\n"
 "omalla avaimellasi: \""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, 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:928
 #, 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:935
 #, 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:945
 #, 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:952
 #, 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:959
 #, 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:964
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Olen tarkistanut avaimen arkisesti.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, 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:981
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "tallenna ja lopeta"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "näytä avaimet ja käyttäjätunnukset"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 #, fuzzy
 msgid "select subkey N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 #, fuzzy
 msgid "check signatures"
 msgstr "mitätöi allekirjoitus"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, 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:1289
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "add a user ID"
 msgstr "lisää käyttäjätunnus"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "lisää valokuva"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "poista käyttäjätunnus"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "poista toissijainen avain"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "lisää mitätöintiavain"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 #, 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:1314
 #, 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:1316
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "merkitse käyttäjätunnus ensisijaiseksi"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "näytä valinnat (asiantuntija)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "näytä valinnat (monisanaisesti)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 #, 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:1325
 #, 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:1327
 #, 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:1329
 msgid "change the passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "muuta luottamusastetta"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 #, 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:1337
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "mitätöi käyttäjätunnus"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "mitätöi toissijainen avain"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 #, fuzzy
 msgid "enable key"
 msgstr "ota avain käyttöön"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 #, fuzzy
 msgid "disable key"
 msgstr "poista avain käytöstä"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "näytä valokuvatunniste"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1349
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1470
 msgid "Secret key is available.\n"
 msgstr "Salainen avain on saatavilla.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 #, 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:1574
 msgid "Need the secret key to do this.\n"
 msgstr "Tähän tarvitaan salainen avain.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4688,309 +4695,293 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "Avain on mitätöity."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 #, 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:1682
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1690
 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:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 #, 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:1756
 #, 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:1814 g10/keyedit.c:1854
 #, 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 #, 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:1894
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, 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:1934
 #, 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:1969
 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:1975
 #, 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:1977
 #, 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:2015
 #, 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:2016
 #, 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:2034
 #, 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:2045
 #, 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:2047
 #, 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:2105
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2150
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "näytä valinnat"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 #, 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:2159
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Varmastiko päivitä valinnat? "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Tallenna muutokset? "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, 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:2557
+#: g10/keyedit.c:2558
 #, 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:2583
+#: g10/keyedit.c:2584
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: g10/keyedit.c:2677
+#: g10/keyedit.c:2717
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Käyttäjätunnusta ei löydy.\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   %08lX allekirjoitti tämän %s%s\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, 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:3211
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Tiiviste: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Ominaisuudet: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaatio: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 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:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4998,19 +4989,19 @@ msgstr ""
 "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:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5019,18 +5010,18 @@ msgstr ""
 "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:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5039,35 +5030,35 @@ msgstr ""
 "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:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5075,38 +5066,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d allekirjoitus poistettu.\n"
 msgstr[1] "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Käyttäjätunnus \"%s\" on mitätöity."
 msgstr[1] "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, 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:4534
+#: g10/keyedit.c:4426
 #, 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:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5116,41 +5107,41 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 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:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 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:4719
+#: g10/keyedit.c:4611
 #, 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:4788
+#: g10/keyedit.c:4680
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5158,183 +5149,183 @@ msgid ""
 msgstr ""
 "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 #, 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:5033
+#: g10/keyedit.c:4925
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/keyedit.c:5039
+#: g10/keyedit.c:4931
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, 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:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, 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:5896
+#: g10/keyedit.c:5790
 #, 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:5918
+#: g10/keyedit.c:5812
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, 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:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, 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:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, 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:6464
+#: g10/keyedit.c:6358
 #, 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:6526
+#: g10/keyedit.c:6420
 #, 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:6623
+#: g10/keyedit.c:6517
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5376,53 +5367,53 @@ msgstr "liian monta \"%c\" valintaa\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "kirjoitetaan suora allekirjoitus\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "kirjoitetaan oma-allekirjoitus\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 #, fuzzy
 msgid "Encrypt"
 msgstr "salaa tiedot"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr ""
 
@@ -5436,179 +5427,179 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, 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:2136
+#: g10/keygen.c:2113
 #, 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:2142
+#: g10/keygen.c:2119
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (vain salaus)\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, 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:2150
+#: g10/keygen.c:2127
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) RSA (salaus ja allekirjoitus)\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (oletusarvo)"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, 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:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 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:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 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:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "poista avain käytöstä"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, 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:2570
+#: g10/keygen.c:2547
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2555
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 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:2641
+#: g10/keygen.c:2618
 #, 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:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5624,7 +5615,7 @@ msgstr ""
 "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
 "     <n>y = Avain vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5640,40 +5631,40 @@ msgstr ""
 "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
 "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Avain on voimassa? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allekirjoitus on voimassa? (0) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s vanhenee %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5681,12 +5672,12 @@ msgstr ""
 "Järjestelmäsi ei osaa näyttää päiväyksiä kuin vuoteen 2038.\n"
 "Se kuitenkin käsittelee päiväykset oikein vuoteen 2106.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Onko tämä oikein (k/e) "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5697,7 +5688,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 #, fuzzy
 msgid ""
 "\n"
@@ -5715,42 +5706,42 @@ msgstr ""
 "     \"Matti Meikäläinen (nuorempi) <matti.meikalainen@osoite.fi>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Oikea nimi: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "Sähköpostiosoite: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Huomautus: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Huomautuksessa on epäkelpo merkki\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, 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:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5761,11 +5752,11 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5780,35 +5771,35 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnHhSsOoLl"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 #, 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:3148
+#: g10/keygen.c:3125
 #, 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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 +5811,18 @@ msgstr ""
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5839,67 +5830,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "luo uusi avainpari"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, fuzzy, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
 
-#: g10/keygen.c:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, 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:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, 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:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5908,7 +5899,7 @@ msgstr ""
 "Huomaa, että tätä avainta ei voida käyttää salaamiseen.  Käytä komentoa\n"
 "\"--edit-key\" luodaksesi toissijaisen avaimen salaustarkoitukseen.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5916,7 +5907,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5924,23 +5915,23 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
@@ -5949,27 +5940,43 @@ msgstr "Haluatko varmasti luoda? "
 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 +5984,7 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d väärää allekirjoitusta\n"
 msgstr[1] "%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 +5992,41 @@ msgid_plural "%d signatures not checked due to errors\n"
 msgstr[0] "1 allekirjoitus jätetty tarkistamatta virheen vuoksi\n"
 msgstr[1] "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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Avainrengas"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr " Ensisijaisen avaimen sormenjälki:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "      Aliavaimen sormenjälki:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Avaimen sormenjälki ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -6400,7 +6407,7 @@ msgstr "binääri"
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "tuntematon "
 
@@ -6546,27 +6553,27 @@ msgstr "pakkaamaton"
 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:1614
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "tuntematon allekirjoitusluokka"
@@ -6687,7 +6694,7 @@ msgid ""
 "%s"
 msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6702,73 +6709,73 @@ msgstr ""
 "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:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Syötä JPEG-tiedostonimi valokuvatunnisteelle: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, 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:239
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:241
 #, 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:257
 #, 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:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Onko tämä oikein (k/E/l)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "etäohjelman suorittamista ei tueta\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "ulkoisen ohjelman luonnoton päättyminen\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6776,7 +6783,7 @@ msgstr ""
 "ulkoisen ohjelman kutsuminen poistettu käytöstä johtuen turvattomista \n"
 "asetustiedoston oikeuksista\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "valokuvatunnistetta ei voi näyttää!\n"
@@ -7113,12 +7120,12 @@ msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 msgid "no valid addressees\n"
 msgstr "ei kelvollisia vastaanottajia\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
@@ -8177,7 +8184,7 @@ msgstr ""
 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"
@@ -8207,14 +8214,14 @@ msgstr "tee --check-trustdb, kiitos\n"
 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"
 msgstr[0] "tähän mennessä käsitelty %lu avainta\n"
 msgstr[1] "tähän mennessä käsitelty %lu avainta\n"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, fuzzy, c-format
 #| msgid "%d keys processed (%d validity counts cleared)\n"
 msgid " (%d validity count cleared)\n"
@@ -8222,23 +8229,23 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 msgstr[1] "%d avainta käsitelty (%d kelpoisuuslaskuria tyhjätty)\n"
 
-#: g10/trustdb.c: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"
@@ -8367,7 +8374,7 @@ msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8375,7 +8382,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8411,7 +8418,7 @@ msgstr "muuta salasanaa"
 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:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8497,75 +8504,75 @@ msgstr[1] "Avaimen luonti epäonnistui: %s\n"
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muuta salasanaa"
 
-#: scd/app-nks.c:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1654
+#: 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:1701
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2074
+#: scd/app-nks.c:2088
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "muuta salasanaa"
 
-#: scd/app-nks.c:2082
+#: 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:2092
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2102
+#: 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:2104
+#: 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:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -8831,13 +8838,13 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8846,11 +8853,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:199 sm/certchain.c:2211
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 #, fuzzy
 msgid "shell"
 msgstr "apua"
@@ -8874,241 +8881,241 @@ msgstr ""
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, 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:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:818
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, 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:1260 sm/certchain.c:1264
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "HUOM: avain on mitätöity!"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 #, 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:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1404
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Tämä avain on vanhentunut!"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "        uusia allekirjoituksia: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "virheellinen varmenne"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "näytä sormenjälki"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1505
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1511
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "tarkista allekirjoitus"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1911 dirmngr/validate.c:693
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "valinta %c%lu on kopio\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "virheellinen varmenne"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9131,7 +9138,7 @@ msgstr "ei käsitelty"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "ei"
@@ -9167,42 +9174,42 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "virheellinen varmenne"
@@ -9761,7 +9768,7 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr ""
@@ -9956,7 +9963,7 @@ msgstr "avainlohkojen poisto epäonnistui: %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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -10207,202 +10214,202 @@ msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1849 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:1923
 #, 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:1938
 #, 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:1945
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1984
 #, 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:2011
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "luo mitätöintivarmenne"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, 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:2084
 #, 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:2226
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2233
 #, 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:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, 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:2301
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2308
 #, 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:2333
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2414
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, 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:2460
 #, 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:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 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:2523
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, 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:2558
 #, 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:2569
 #, 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:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
@@ -10765,12 +10772,12 @@ msgstr "käyttö: gpg [valitsimet] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
@@ -11018,93 +11025,93 @@ msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:582
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/ocsp.c:598 dirmngr/ocsp.c:782
+#: 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:642
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:698
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "luo mitätöintivarmenne"
 
-#: dirmngr/ocsp.c:708
+#: 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:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:753
+#: 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:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:765
+#: 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:822
+#: 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:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11118,64 +11125,64 @@ msgstr "allekirjoitus epäonnistui: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, 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:1743
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1776
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, 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:3062
+#: dirmngr/server.c:3078
 #, 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:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11494,87 +11501,101 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: 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:3706
+#: tools/gpg-card.c:3764
 #, fuzzy
 #| msgid "change the expire date"
 msgid "change a private data object"
 msgstr "muuta voimassoloaikaa"
 
-#: tools/gpg-card.c:3707
+#: tools/gpg-card.c:3765
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: tools/gpg-card.c:3708
+#: tools/gpg-card.c:3766
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Mitätöintivarmenne luotu.\n"
 
-#: tools/gpg-card.c:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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"
 
@@ -13203,9 +13224,6 @@ msgstr ""
 #~ msgid "delete signatures"
 #~ msgstr "poista allekirjoitus"
 
-#~ msgid "set preference list"
-#~ msgstr "näytä valinnat"
-
 #~ msgid "updated preferences"
 #~ msgstr "päivitä valinnat"
 
diff --git a/po/fr.gmo b/po/fr.gmo
index 12f11ab..5054851 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index c5f63b1..d2b70dc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2017-11-02 17:40+0100\n"
 "Last-Translator: David Prévot <david@tilapin.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -160,8 +160,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "Phrase secrète :"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "ne correspond pas — veuillez réessayer"
 
@@ -210,17 +210,17 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, 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:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Veuillez répéter cette phrase secrète"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -232,7 +232,7 @@ msgstr ""
 "Veuillez entrer la phrase secrète pour protéger l'objet importé dans le "
 "système GnuPG."
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -243,25 +243,25 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "impossible d'ouvrir « %s » : %s\n"
@@ -271,13 +271,13 @@ msgstr "impossible d'ouvrir « %s » : %s\n"
 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:2467
+#: agent/command-ssh.c:2472
 #, 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:2777
+#: agent/command-ssh.c:2782
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -286,20 +286,20 @@ msgstr ""
 "Un processus SSH demande à utiliser la clef%%0A  %s%%0A  (%s)%%0AVoulez-vous "
 "l'autoriser ?"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Autoriser"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Refuser"
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -308,7 +308,7 @@ msgstr ""
 "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:3797
+#: agent/command-ssh.c:3837
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "échec de création du flux à partir de cette socket : %s\n"
@@ -443,204 +443,210 @@ msgstr "Veuillez entrer la phrase secrète%0Apour protéger la nouvelle clef"
 msgid "Please enter the new passphrase"
 msgstr "Veuillez entrer la nouvelle phrase secrète"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Options pratiques pour le débogage"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr "exécuter en mode démon (arrière-plan)"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr "exécuter en mode serveur (premier plan)"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "ne pas détacher de la console"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr "sortie de commandes à la sh"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr "sortie de commandes à la csh"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 msgid "|FILE|read options from FILE"
 msgstr "|FICHIER|lire les options depuis le FICHIER"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr "Options contrôlant la sortie de diagnostique"
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "bavard"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FICHIER|écrire les journaux serveur dans le FICHIER"
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr "Options contrôlant la configuration"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 msgid "do not use the SCdaemon"
 msgstr "ne pas utiliser le SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PROG|utiliser PROG comme SCdaemon"
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 #, 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:215
+#: agent/gpg-agent.c:216
 #, 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:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr "ignorer les demandes de modification du TTY"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr "ignorer les demandes de modification d'aff. X"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 msgid "enable ssh support"
 msgstr "activer la prise en charge de SSH"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 msgid "enable putty support"
 msgstr "activer la prise en charge de putty"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "activer la prise en charge de putty"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "Options contrôlant la sécurité"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|oublier les codes personnels après N secondes"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|oublier les clefs SSH après N secondes"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 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:248
+#: agent/gpg-agent.c:256
 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:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr "ne pas utiliser le cache de code pour signer"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 #, 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:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "ne pas marquer les clefs comme de confiance"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 msgid "allow presetting passphrase"
 msgstr "permettre de préconfigurer la phrase secrète"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr "Options d'application d'une politique de phrase secrète"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr "pas de contournement de politique de phrase secrète"
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 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:271
+#: agent/gpg-agent.c:279
 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:274
+#: agent/gpg-agent.c:282
 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:278
+#: agent/gpg-agent.c:286
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|la phrase secrète expire après N jours"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 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:283
+#: agent/gpg-agent.c:291
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Options contrôlant la sécurité"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 #, 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:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PROG|utiliser PROG pour entrer le code personnel"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 #, 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:300
+#: agent/gpg-agent.c:308
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
@@ -648,8 +654,8 @@ 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
@@ -658,11 +664,11 @@ msgstr ""
 "Veuillez signaler toutes anomalies sur <@EMAIL@> (en anglais)\n"
 "et tout problème de traduction à <traduc@traduc.org>.\n"
 
-#: agent/gpg-agent.c:570
+#: agent/gpg-agent.c:582
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Utilisation : dirmngr @GPG_AGENT@ (-h pour l'aide)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -670,138 +676,138 @@ msgstr ""
 "Syntaxe : @GPG_AGENT@ [options] [commande [arguments]]\n"
 "Gestionnaire de clefs secrètes pour @GNUPG@\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "niveau de débogage « %s » incorrect\n"
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage sélectionnée est incorrecte\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "lecture des options de « %s »\n"
 
-#: agent/gpg-agent.c:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "Attention : « %s » est une option déconseillée\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossible de créer la socket : %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, 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:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "erreur de lecture du « nonce » de la socket\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "erreur de lien de la socket à « %s » : %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, 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:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "écoute sur la socket « %s »\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, 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:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "répertoire « %s » créé\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "échec de stat() pour « %s » : %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, 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:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, 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:2768
+#: agent/gpg-agent.c:2882
 #, 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:2773
+#: agent/gpg-agent.c:2887
 #, 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:2848
+#: agent/gpg-agent.c:2962
 #, 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:2853
+#: agent/gpg-agent.c:2967
 #, 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:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "échec de npth_pselect : %s — attente 1 s\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s arrêté\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1082,7 +1088,7 @@ msgstr "échec de vérification de la signature créée : %s\n"
 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:1602
 #, 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"
@@ -1098,53 +1104,53 @@ msgid "protection hash algorithm %d (%s) is not supported\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1174,19 +1180,19 @@ msgstr "Avertissement : le propriétaire de %s n'est pas sûr « %s »\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Avertissement : les droits de %s ne sont pas sûrs « %s »\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, fuzzy, c-format
 #| msgid "waiting for the agent to come up ... (%ds)\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "attente pour permettre à l'agent d'arriver… (%d s)\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "oui"
 
@@ -1240,8 +1246,8 @@ msgstr "hors limite de la mémoire sécurisée lors de l'allocation de %lu octe
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1261,75 +1267,75 @@ msgstr "Attention : « %s%s » est une option obsolète — non prise en com
 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:432 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"
@@ -1478,11 +1484,11 @@ msgstr "Chaîne de certificats correcte"
 msgid "Root certificate trustworthy"
 msgstr "Certificat racine digne de confiance"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 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:1115 sm/certchain.c:1284
 msgid "the available CRL is too old"
 msgstr "la liste de révocations de certificat est trop vieille"
 
@@ -1519,7 +1525,7 @@ msgstr "Pas d'aide disponible pour « %s »."
 msgid "ignoring garbage line"
 msgstr "ligne inutile ignorée"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "[none]"
 msgstr "[aucun]"
 
@@ -1563,36 +1569,36 @@ msgstr "échec de iconv_open : %s\n"
 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
 #, 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"
@@ -1602,92 +1608,92 @@ msgstr "attente du verrou %s…\n"
 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
+#: 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"
@@ -1695,13 +1701,13 @@ msgstr ""
 "caractère Quoted-Printable dans l'armure provenant sans\n"
 "doute d'un serveur de courriers électroniques défectueux\n"
 
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, 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:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1710,28 +1716,28 @@ msgstr ""
 "un nom de notation ne doit contenir que des caractères imprimables ou des "
 "espaces, et se terminer avec « = »\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, 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:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1741,7 +1747,7 @@ msgstr ""
 "un nom de notation ne doit contenir que des caractères imprimables ou des "
 "espaces, et se terminer avec « = »\n"
 
-#: g10/build-packet.c:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "Attention : des données de notation incorrectes ont été trouvées.\n"
@@ -1755,7 +1761,7 @@ msgstr "échec de transfert de la demande %s au client\n"
 msgid "Enter passphrase: "
 msgstr "Entrez la phrase secrète : "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 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"
@@ -1774,7 +1780,7 @@ msgstr "erreur de lecture de %s : %s\n"
 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:2330
+#: 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"
@@ -1821,172 +1827,172 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "générer un certificat de révocation"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "forcé"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 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:1500
+#: g10/card-util.c:803 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:1502
+#: g10/card-util.c:805 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:1535
+#: g10/card-util.c:823 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:1536
+#: g10/card-util.c:825 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:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 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:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Données DO privées : "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Préférences de langue : "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 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:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "empreinte de l'autorité de certification : "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 msgid "not an OpenPGP card"
 msgstr "ce n'est pas une carte OpenPGP"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr "Faut-il remplacer la clef existante ? (o/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 tools/gpg-card.c:3363
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -2002,84 +2008,84 @@ msgstr ""
 "           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:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 #, 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:1474
 #, 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:1476
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Clef d'authentification\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Choix incorrect.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, fuzzy, c-format
 #| msgid "error getting current key info: %s\n"
 msgid "error getting card info: %s\n"
@@ -2087,29 +2093,29 @@ msgstr ""
 "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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 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:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2120,191 +2126,191 @@ msgstr ""
 "   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:1741
 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:1743 g10/card-util.c:1833
 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:1744 g10/card-util.c:1835
 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:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clef d'authentification\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 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:1876
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "échec de KEYTOCARD : %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr "afficher les commandes d'administration"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "afficher cette aide"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 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:3687
+#: g10/card-util.c:2260 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:3688
+#: g10/card-util.c:2261 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:3689
+#: g10/card-util.c:2262 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:3690
+#: g10/card-util.c:2263 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:3691
+#: g10/card-util.c:2264 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:3692
+#: g10/card-util.c:2265 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:3694
+#: g10/card-util.c:2267 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:3695
+#: g10/card-util.c:2268 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:3696
+#: g10/card-util.c:2269 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:3697
+#: g10/card-util.c:2270 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:3698
+#: g10/card-util.c:2271 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:3699
+#: g10/card-util.c:2272 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:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 #, 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:2276
 #, 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:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/carte> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 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:2473
 msgid "Admin commands are allowed\n"
 msgstr "Les commandes d'administration sont permises\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2363,9 +2369,9 @@ msgstr "clef"
 msgid "subkey"
 msgstr "sous-clef"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "échec de la mise à jour : %s\n"
@@ -2399,19 +2405,19 @@ 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:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, 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"
@@ -2423,45 +2429,46 @@ msgstr "impossible d'utiliser l'algorithme de chiffrement « %s » en mode %s.
 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:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur de création de la phrase secrète : %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, 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:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "« %s » est déjà compressé\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "Attention : « %s » est un fichier vide\n"
 
-#: g10/encrypt.c:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 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 "impossible d'utiliser l'algorithme de hachage « %s » en mode %s.\n"
 
-#: g10/encrypt.c:862
+#: g10/encrypt.c:853
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "lecture de « %s »\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2470,13 +2477,13 @@ msgstr ""
 "Attention : forcer l'algorithme de compression %s (%d) est en\n"
 "            désaccord avec les préférences du destinataire\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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"
@@ -2506,61 +2513,73 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "Attention : rien n'a été exporté\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2631,7 +2650,7 @@ msgstr ""
 "utilisation de la sous-clef %s à la place de la clef\n"
 "principale %s\n"
 
-#: g10/getkey.c:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
@@ -2711,113 +2730,113 @@ msgstr "générer rapidement une nouvelle paire de clefs"
 msgid "quickly set a new expiration date"
 msgstr "générer rapidement une nouvelle paire de clefs"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr "générer une paire de clefs complètes"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "générer un certificat de révocation"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "supprimer les clefs du porte-clefs public"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "supprimer les clefs du porte-clefs secret"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "quickly sign a key"
 msgstr "signer rapidement une clef"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 msgid "quickly sign a key locally"
 msgstr "signer rapidement une clef localement"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, 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:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "signer une clef"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "signer une clef localement"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "signer ou éditer une clef"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "modifier une phrase secrète"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "exporter les clefs"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "exporter les clefs vers un serveur de clefs"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "importer les clefs d'un serveur de clefs"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "chercher les clefs avec un serveur de clefs"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "mettre à jour les clefs depuis un serveur"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "importer ou fusionner les clefs"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr "afficher l'état de la carte"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr "modifier les données d'une carte"
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr "modifier le code personnel d'une carte"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "mettre la base de confiance à jour"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 msgid "print message digests"
 msgstr "indiquer les fonctions de hachage"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "exécuter en mode serveur"
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOM|chiffrer aussi pour l'identité NOM"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|configurer les alias d'adresse"
 
@@ -2833,61 +2852,61 @@ msgstr "ne rien modifier"
 msgid "prompt before overwriting"
 msgstr "demander avant d'écraser un fichier"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Options contrôlant la sécurité"
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Options contrôlant la sortie de diagnostique"
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "créer une sortie ASCII avec armure"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FICHIER|écrire la sortie dans le FICHIER"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|niveau de compression N (0 désactive)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 #, 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:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MÉCANISMES|utiliser les MÉCANISMES pour localiser les clefs"
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 #, 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:781
+#: g10/gpg.c:780
 #, 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:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "désactiver tous les accès au dirmngr"
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2916,7 +2935,7 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2925,7 +2944,7 @@ msgstr ""
 "(Consultez la page de manuel pour obtenir une liste complète des commandes\n"
 "et options)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2955,11 +2974,11 @@ msgstr ""
 " --list-keys [noms]         montrer les clefs\n"
 " --fingerprint [noms]       montrer les empreintes\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Utilisation : @GPG@ [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1172
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2969,7 +2988,7 @@ msgstr ""
 "Signer, vérifier, chiffrer ou déchiffrer\n"
 "L'opération par défaut dépend des données entrées\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2977,87 +2996,87 @@ msgstr ""
 "\n"
 "Algorithmes pris en charge :\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Clef publique : "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Chiffrement : "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Hachage : "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Compression : "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "utilisation : %s [options] %s\n"
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, 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:1708
+#: g10/gpg.c:1698
 #, 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:1711
+#: g10/gpg.c:1701
 #, 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:1714
+#: g10/gpg.c:1704
 #, 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:1720
+#: g10/gpg.c:1710
 #, 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:1723
+#: g10/gpg.c:1713
 #, 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:1726
+#: g10/gpg.c:1716
 #, 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:1732
+#: g10/gpg.c:1722
 #, 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:1735
+#: g10/gpg.c:1725
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -3065,21 +3084,21 @@ msgstr ""
 "Attention : le propriétaire du répertoire contenant le fichier de\n"
 "            configuration « %s » n'est pas sûr\n"
 
-#: g10/gpg.c:1738
+#: g10/gpg.c:1728
 #, 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:1744
+#: g10/gpg.c:1734
 #, 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:1747
+#: g10/gpg.c:1737
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -3087,488 +3106,476 @@ msgstr ""
 "Attention : les droits du répertoire contenant le fichier de configuration\n"
 "            « %s » ne sont pas sûrs\n"
 
-#: g10/gpg.c:1750
+#: g10/gpg.c:1740
 #, 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:1966
+#: g10/gpg.c:1956
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "élément de configuration « %s » inconnu\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr "montrer les photos d'identité en affichant les clefs"
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 msgid "show key usage information during key listings"
 msgstr "indiquer les informations sur l'utilisation en affichant les clefs"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr "montrer les URL de politique en affichant les signatures"
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 msgid "show all notations during signature listings"
 msgstr "montrer toutes les notations en affichant les signatures"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr "utiliser les notations aux normes IETF en affichant les signatures"
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "utiliser les notations fournies par l'utilisateur en affichant les signatures"
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "montrer les URL des serveurs de clefs favoris en affichant les signatures"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr "indiquer la validité de l'identité en affichant les clefs"
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 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:2082
+#: g10/gpg.c:2072
 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:2084
+#: g10/gpg.c:2074
 msgid "show the keyring name in key listings"
 msgstr "montrer le nom du porte-clefs en affichant les clefs"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 msgid "show expiration dates during signature listings"
 msgstr "montrer les dates d'expiration en affichant les signatures"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "afficher les préférences (expert)"
+
+#: g10/gpg.c:2197
 #, fuzzy, c-format
 #| msgid "unknown option '%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "option « %s » inconnue\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, 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:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, 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:3220
+#: g10/gpg.c:3194
 #, 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:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "mode pinentry « %s » incorrect\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, 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:3315
+#: g10/gpg.c:3286
 #, 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:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'analyser l'URL du serveur de clefs\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s : %d : les options du serveur de clefs sont incorrectes\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de clefs sont incorrectes\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s : %d : options d'importation incorrectes\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "options d'importation incorrectes\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "options de liste incorrectes\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s : %d : options d'exportation incorrectes\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "options d'exportation incorrectes\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s : %d : options de liste incorrectes\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr "options de liste incorrectes\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr "montrer les photos d'identité en vérifiant les signatures"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr "montrer les URL de politique en vérifiant les signatures"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 msgid "show all notations during signature verification"
 msgstr "montrer toutes les notations en vérifiant les signatures"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr "utiliser les notations aux normes IETF en vérifiant les signatures"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 "utiliser les notations fournies par l'utilisateur en vérifiant les signatures"
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 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:3420
+#: g10/gpg.c:3396
 msgid "show user ID validity during signature verification"
 msgstr "indiquer la validité de l'identité en vérifiant les signatures"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 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:3424
+#: g10/gpg.c:3400
 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:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s : %d : options de vérification incorrectes\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr "options de vérification incorrectes\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, 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:3648
+#: g10/gpg.c:3621
 #, 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:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "liste de recherche automatique de clef incorrecte\n"
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "argument incorrect pour l'option « %.50s »\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, 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:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "Attention : %s remplace %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s.\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s.\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "Attention : exécution avec un système de temps contrefait : "
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, 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:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement sélectionné est incorrect\n"
 
-#: g10/gpg.c:3952
-#, 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:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression sélectionné est incorrect\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, 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:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "« completes-needed » doit être supérieur à 0\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "« marginals-needed » doit être supérieur à 1\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "préférences par défaut incorrectes\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "préférences personnelles de chiffrement incorrectes\n"
 
-#: g10/gpg.c:4015
-#, 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:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "préférences personnelles de hachage incorrectes\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "préférences personnelles de compression incorrectes\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, 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:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne fonctionne pas encore avec %s\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance : %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "échec du chiffrement symétrique de « %s » : %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, 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:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, 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:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 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:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "échec de réception depuis le serveur de clefs : %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "échec d'exportation de la clef : %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, 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:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "échec de recherche au sein du serveur de clefs : %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "échec de rafraîchissement par le serveur de clefs : %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "échec de déconstruction d'une armure : %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "échec de construction d'une armure : %s \n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algorithme de hachage « %s » incorrect\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message…\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, 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:5726
+#: g10/gpg.c:5682
 #, 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:5759
+#: g10/gpg.c:5715
 #, 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"
@@ -3581,7 +3588,7 @@ msgstr "|FICHIER|prendre les clefs dans le porte-clefs FICHIER"
 msgid "make timestamp conflicts only a warning"
 msgstr "convertir les conflits de date en avertissements"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 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"
 
@@ -3610,166 +3617,166 @@ msgstr "Pas d'aide disponible"
 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"
@@ -3778,174 +3785,174 @@ msgstr ""
 "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:1998 g10/import.c:3146
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "clef %s : pas d'identité\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, c-format
 msgid "key %s: %s\n"
 msgstr "clef %s : %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr "rejetée par le filtre d’importation"
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clef %s : nouvelle clef — ignorée\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, 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:2793
 #, 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:2801
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "clef %s : erreur d'envoi à l'agent : %s\n"
@@ -3958,204 +3965,204 @@ msgstr "clef %s : erreur d'envoi à l'agent : %s\n"
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, 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:3138 g10/import.c:3177
 #, 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:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "cause de révocation : "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "commentaire de révocation : "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, 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:3788
 #, 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:3812
 #, 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:3825
 #, 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:3840
 #, 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:3887
 #, 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:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clef %s : sous-clef ignorée\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clef %s : ajout de la signature directe de clef\n"
@@ -4198,7 +4205,7 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "Identité « %s » : %d signature supprimée\n"
 msgstr[1] "Identité « %s » : %d signature supprimée\n"
 
-#: g10/key-check.c:726 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"
@@ -4206,7 +4213,7 @@ msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr[0] "1 signature non vérifiée à cause d'une clef manquante\n"
 msgstr[1] "1 signature non vérifiée à cause d'une clef manquante\n"
 
-#: g10/key-check.c:734 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"
@@ -4259,15 +4266,15 @@ msgstr "ressource de bloc de clef « %s » : %s\n"
 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:262
 msgid "[revocation]"
 msgstr "[révocation]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[autosignature]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4278,17 +4285,17 @@ msgstr ""
 "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:389 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:390 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:408
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4298,52 +4305,52 @@ msgstr ""
 "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:425
 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:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr " Impossible de signer.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'identité « %s » est expiré."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, 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:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "L'identité « %s » peut être signée. "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr "Faut-il la signer ? (o/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4352,11 +4359,11 @@ msgstr ""
 "L'autosignature de « %s »\n"
 "est une signature de type PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4365,13 +4372,13 @@ msgstr ""
 "Votre signature actuelle de « %s »\n"
 "a expiré.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4380,43 +4387,43 @@ msgstr ""
 "Votre signature actuelle de « %s »\n"
 "est locale.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "Cette clef a expiré."
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4425,31 +4432,31 @@ msgstr ""
 "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:874
 #, 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:876
 #, 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:878
 #, 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:881
 #, 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:888
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Quel est votre choix ? (Entrez « ? » pour plus de renseignements) : "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4458,239 +4465,239 @@ msgstr ""
 "Voulez-vous vraiment signer cette clef avec votre\n"
 "clef « %s » (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 msgid "This will be a self-signature.\n"
 msgstr "Ce sera une autosignature.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 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:935
 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:945
 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:952
 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:959
 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:964
 msgid "I have checked this key casually.\n"
 msgstr "J'ai partiellement vérifié cette clef.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 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:981
 msgid "Really sign? (y/N) "
 msgstr "Voulez-vous vraiment signer ? (o/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "échec de la signature : %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 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:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 msgid "show key fingerprint"
 msgstr "afficher l'empreinte de la clef"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 #, fuzzy
 #| msgid "Enter the keygrip: "
 msgid "show the keygrip"
 msgstr "Entrez le keygrip : "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "afficher la clef et les identités"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "sélectionner l'identité N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr "sélectionner la sous-clef N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr "vérifier les signatures"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 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:1286
 msgid "sign selected user IDs locally"
 msgstr "signer les identités sélectionnées localement"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 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:1289
 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:1291
 msgid "add a user ID"
 msgstr "ajouter une identité"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identité"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr "supprimer les identités sélectionnées"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr "ajouter une sous-clef"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr "ajouter une clef à une carte à puce"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr "déplacer une clef vers une carte à puce"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 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:1308
 msgid "delete selected subkeys"
 msgstr "supprimer les sous-clefs sélectionnées"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "ajouter une clef de révocation"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 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:1314
 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:1316
 msgid "flag the selected user ID as primary"
 msgstr "marquer l'identité sélectionnée comme principale"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "afficher les préférences (expert)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "afficher les préférences (bavard)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 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:1325
 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:1327
 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:1329
 msgid "change the passphrase"
 msgstr "modifier la phrase secrète"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "modifier la confiance du propriétaire"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 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:1337
 msgid "revoke selected user IDs"
 msgstr "révoquer les identités sélectionnées"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 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:1342
 msgid "enable key"
 msgstr "activer la clef"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr "désactiver la clef"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr "montrer les photos d'identité sélectionnées"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 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:1349
 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:1470
 msgid "Secret key is available.\n"
 msgstr "La clef secrète est disponible.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 #, 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:1574
 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:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4702,298 +4709,282 @@ msgstr ""
 "  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:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "La clef est révoquée."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 #, 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:1682
 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:1690
 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:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 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:1756
 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:1814 g10/keyedit.c:1854
 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 msgid "You must select exactly one key.\n"
 msgstr "Vous devez sélectionner exactement une clef.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 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:1915
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "Impossible d'ouvrir « %s » : %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, 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:1969
 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:1975
 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:1977
 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:2015
 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:2016
 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:2034
 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:2045
 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:2047
 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:2105
 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:2150
 msgid "Set preference list to:\n"
 msgstr "Définir la liste de préférences en :\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 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:2159
 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:2233
 msgid "Save changes? (y/N) "
 msgstr "Faut-il enregistrer les modifications ? (o/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr "Faut-il quitter sans enregistrer ? (o/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, 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:2557
+#: g10/keyedit.c:2558
 #, 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:2583
+#: g10/keyedit.c:2584
 #, 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:2646
+#: g10/keyedit.c:2647
 #, 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:2677
+#: g10/keyedit.c:2717
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "« %s » n’est pas une empreinte\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "« %s » n’est pas l’empreinte principale\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "valeur incorrecte\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "No matching user IDs."
 msgstr "Pas d’identités correspondantes."
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "Nothing to sign.\n"
 msgstr "Rien à signer.\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Non signée par vous.\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, 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:3211
+#: g10/keyedit.c:3251
 #, 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:3253
+#: g10/keyedit.c:3293
 #, 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:3277
+#: g10/keyedit.c:3317
 #, 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:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Hachage : "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Fonctionnalités : "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr "Serveur de clefs sans modification"
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Serveur de clefs favori : "
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr "Notations : "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "créé : %s"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr "révoquée : %s"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr "expirée : %s"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "expire : %s"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr "utilisation : %s"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr "nº de carte : "
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr "confiance : %s"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr "validité : %s"
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Cette clef a été désactivée"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5001,17 +4992,17 @@ msgstr ""
 "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:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "expirée"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5021,17 +5012,17 @@ msgstr ""
 "commande\n"
 "            risque de rendre une autre identité principale par défaut.\n"
 
-#: g10/keyedit.c:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "Attention : votre sous-clef de chiffrement expire bientôt.\n"
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5040,38 +5031,38 @@ msgstr ""
 "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:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Voulez-vous vraiment toujours l'ajouter ? (o/N) "
 
-#: g10/keyedit.c:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 #, 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:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature incorrecte ? (o/N/q)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette autosignature ? (o/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5079,20 +5070,20 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d signature supprimée.\n"
 msgstr[1] "%d signature supprimée.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a été supprimé.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "incorrecte"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Identité « %s » compactée : %s\n"
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
@@ -5100,17 +5091,17 @@ msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Identité « %s » : %d signature supprimée\n"
 msgstr[1] "Identité « %s » : %d signature supprimée\n"
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Identité « %s » : déjà minimisée\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Identité « %s » : déjà nettoyée\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5119,46 +5110,46 @@ msgstr ""
 "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:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez l'identité du révocateur désigné : "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 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:4719
+#: g10/keyedit.c:4611
 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:4788
+#: g10/keyedit.c:4680
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5168,181 +5159,181 @@ msgid ""
 msgstr ""
 "Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modification de la date d'expiration d'une sous-clef.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modification de la date d'expiration de la clef principale.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 #, 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:4915
+#: g10/keyedit.c:4807
 #, 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:5033
+#: g10/keyedit.c:4925
 #, 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:5039
+#: g10/keyedit.c:4931
 #, 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:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Veuillez sélectionner exactement une identité.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, 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:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de clefs favori : "
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voulez-vous vraiment le remplacer ? (o/N) "
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voulez-vous vraiment le supprimer ? (o/N) "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 msgid "Enter the notation: "
 msgstr "Entrez la notation : "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 msgid "Proceed? (y/N) "
 msgstr "Faut-il continuer ? (o/N) "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'identité d'indice %d\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Pas d'identité avec le hachage %s\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, 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:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas de sous-clef d'indice %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "identité : « %s »\n"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expiré le %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 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:6078
+#: g10/keyedit.c:5972
 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:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr " (non révocable)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, 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:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous êtes sur le point de révoquer ces signatures :\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Faut-il vraiment créer les certificats de révocation ? (o/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "pas de clef secrète\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'identité « %s »\" est déjà révoquée.\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, 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:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clef %s est déjà révoqué.\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sous-clef %s est déjà révoquée.\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5387,35 +5378,35 @@ 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:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "écriture de la signature directe\n"
 
 # g10/keygen.c:123 ???
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "écriture de l'autosignature\n"
 
 # g10/keygen.c:161 ???
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "écriture de la signature de lien à la clef\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "taille incorrecte ; utilisation de %u bits\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie à %u bits\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5423,19 +5414,19 @@ msgstr ""
 "Attention : certains programmes OpenPGP ne peuvent pas gérer\n"
 "            de clef DSA avec cette taille de hachage\n"
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr "Signer"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr "Certifier"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr "Chiffrer"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr "Authentifier"
 
@@ -5449,180 +5440,180 @@ msgstr "Authentifier"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr "SsCcAaQq"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, 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:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr "Actions actuellement permises : "
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Inverser la capacité de signature\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Inverser la capacité de chiffrement\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Inverser la capacité d'authentification\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Terminé\n"
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, 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:2131
+#: g10/keygen.c:2108
 #, 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:2134
+#: g10/keygen.c:2111
 #, 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:2136
+#: g10/keygen.c:2113
 #, 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:2142
+#: g10/keygen.c:2119
 #, 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:2144
+#: g10/keygen.c:2121
 #, 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:2150
+#: g10/keygen.c:2127
 #, 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:2152
+#: g10/keygen.c:2129
 #, 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:2158
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid "   (%d) sign, encrypt\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) signer, chiffrer\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (signature seule)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, 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:2163
+#: g10/keygen.c:2140
 #, 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:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) Clef existante\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, 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:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Entrez le keygrip : "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Pas de clef avec ce keygrip\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 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:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Clefs disponibles :\n"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "arrondie à %u bits\n"
 
-#: g10/keygen.c:2570
+#: g10/keygen.c:2547
 #, 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:2578
+#: g10/keygen.c:2555
 #, 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:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 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:2641
+#: g10/keygen.c:2618
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Sélectionnez le type de courbe elliptique désiré :\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5638,7 +5629,7 @@ msgstr ""
 "      <n>m = la clef expire dans n mois\n"
 "      <n>y = la clef expire dans n ans\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5655,38 +5646,38 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ans\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Pendant combien de temps la clef est-elle valable ? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Pendant combien de temps la signature est-elle valable ? (%s) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "valeur incorrecte\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr "La clef n'expire pas du tout\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr "La signature n'expire pas du tout\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clef expire le %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5694,11 +5685,11 @@ msgstr ""
 "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:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr "Est-ce correct ? (o/N) "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5712,7 +5703,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5728,41 +5719,41 @@ msgstr ""
 "   « Heinrich Heine (le poète) <heinrichh@duesseldorf.de> »\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Nom réel : "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Caractère incorrect dans le nom\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "Adresse électronique : "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse électronique valable\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Commentaire : "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Caractère incorrect dans le commentaire\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Vous utilisez le jeu de caractères « %s ».\n"
 
-#: g10/keygen.c:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5773,13 +5764,13 @@ msgstr ""
 "    « %s »\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Cette identité existe déjà pour cette clef.\n"
 
@@ -5794,34 +5785,34 @@ msgstr "Cette identité existe déjà pour cette clef.\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnCcAaOoQq"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Changer le (N)om, l’(A)dresse électronique ou (Q)uitter ? "
 
-#: g10/keygen.c:3148
+#: g10/keygen.c:3125
 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Veuillez d'abord corriger l'erreur\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5833,18 +5824,18 @@ msgstr ""
 "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:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Échec de génération de la clef : %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5855,66 +5846,66 @@ msgstr ""
 "   « %s »\n"
 "\n"
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr "Faut-il continuer ? (O/n) "
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Une clef pour « %s » existe déjà\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 msgid "Create anyway? (y/N) "
 msgstr "Faut-il quand même créer ? (o/N) "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, c-format
 msgid "creating anyway\n"
 msgstr "création quand même\n"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, 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:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "La génération de clef a été annulée.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, 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:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "écriture de la clef publique dans « %s »\n"
 
-#: g10/keygen.c:5599
+#: g10/keygen.c:5570
 #, 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:5613
+#: g10/keygen.c:5584
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "erreur d'écriture du porte-clefs public « %s » : %s\n"
 
-#: g10/keygen.c:5644
+#: g10/keygen.c:5615
 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:5660
+#: g10/keygen.c:5631
 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"
@@ -5923,7 +5914,7 @@ msgstr ""
 "pouvez\n"
 "utiliser la commande « --edit-key » pour générer une sous-clef à cette fin.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5931,7 +5922,7 @@ msgstr ""
 "la clef a été créée %lu seconde dans le futur (faille temporelle ou\n"
 "problème d'horloge)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5939,25 +5930,25 @@ msgstr ""
 "la clef a été créée %lu secondes dans le futur (faille temporelle ou\n"
 "problème d'horloge)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr "Faut-il vraiment la créer ? (o/N) "
 
@@ -5965,27 +5956,43 @@ msgstr "Faut-il vraiment la créer ? (o/N) "
 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"
@@ -5993,7 +6000,7 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d mauvaises signatures\n"
 msgstr[1] "%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"
@@ -6001,7 +6008,7 @@ msgid_plural "%d signatures not checked due to errors\n"
 msgstr[0] "1 signature non vérifiée à cause d'une erreur\n"
 msgstr[1] "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"
@@ -6009,33 +6016,33 @@ msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
 msgstr[0] "Attention : %lu clefs ignorées en raison de leur grande taille\n"
 msgstr[1] "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:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Empreinte de clef principale :"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr "Empreinte clef princip. :"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr " Empreinte de sous-clef :"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr " Empreinte de la clef ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr " Nº de série de carte ="
 
@@ -6418,7 +6425,7 @@ msgstr "binaire"
 msgid "textmode"
 msgstr "mode texte"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "inconnu"
 
@@ -6565,29 +6572,29 @@ msgstr "Non compressé"
 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:1614
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "option « %s » ambiguë\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "option « %s » inconnue\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, fuzzy, c-format
 #| msgid "Unknown signature type '%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6720,7 +6727,7 @@ msgstr ""
 "créée le %7$s%8$s.\n"
 "%9$s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6734,75 +6741,75 @@ msgstr ""
 "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:207
 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:228
 #, 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:239
 #, 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:241
 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:257
 #, 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:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Cette photo est-elle correcte (o/N/q) ? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, 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:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "sortie non naturelle du programme externe\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6810,7 +6817,7 @@ msgstr ""
 "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:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "impossible d'afficher la photo d'identité.\n"
@@ -7153,12 +7160,12 @@ msgstr "destinataire par défaut « %s » inconnu\n"
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valable\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, 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:1768
+#: g10/pkclist.c:1766
 #, 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"
@@ -8266,7 +8273,7 @@ msgstr "utilisation du modèle de confiance %s\n"
 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"
@@ -8300,7 +8307,7 @@ msgstr "veuillez faire un --check-trustdb\n"
 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"
@@ -8308,7 +8315,7 @@ msgid_plural "%d keys processed"
 msgstr[0] "%lu clefs traitées jusqu'à présent\n"
 msgstr[1] "%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"
@@ -8316,17 +8323,17 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d clefs traitées (%d comptes de validité réinitialisés)\n"
 msgstr[1] "%d clefs traitées (%d comptes de validité réinitialisés)\n"
 
-#: g10/trustdb.c: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"
@@ -8334,7 +8341,7 @@ msgstr ""
 "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 ""
@@ -8465,7 +8472,7 @@ msgstr ""
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8473,7 +8480,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8517,7 +8524,7 @@ msgstr ""
 "|P|Veuillez entrer le code de déblocage personnel (CDP) pour les clefs "
 "standards."
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8610,7 +8617,7 @@ msgstr[1] "la génération de clef est terminé (%d secondes)\n"
 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:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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 "
@@ -8618,58 +8625,58 @@ 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Veuillez entrer le code personnel d'administration"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 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:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, 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:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, 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:1654
+#: 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:1701
+#: 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:2074
+#: 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:2082
+#: 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:2092
+#: 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:2102
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8677,7 +8684,7 @@ msgstr ""
 "|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:2104
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8685,7 +8692,7 @@ msgstr ""
 "|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:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erreur de lecture du nouveau code personnel : %s\n"
@@ -8963,13 +8970,13 @@ msgstr "gestionnaire pour le descripteur %d démarré\n"
 msgid "handler for fd %d terminated\n"
 msgstr "gestionnaire pour le descripteur %d terminé\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8978,11 +8985,11 @@ msgstr ""
 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:199 sm/certchain.c:2211
 msgid "chain"
 msgstr "chaîne"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 msgid "shell"
 msgstr "invite"
 
@@ -9006,241 +9013,241 @@ msgstr "politique de signature marquée critique sans politiques configurées"
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "impossible d'obtenir l'empreinte\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, 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:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "nombre d'émetteurs correspondants : %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, 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:818
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "nombre de certificats correspondants : %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, 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:1260 sm/certchain.c:1264
 msgid "certificate has been revoked"
 msgstr "le certificat a été révoquée"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr "l'état du certificat est inconnu"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, 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:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certificat pas encore valable"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 msgid "root certificate not yet valid"
 msgstr "certificat racine pas encore valable"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr "certificat intermédiaire pas encore valable"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr "le certificat a expiré"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 msgid "root certificate has expired"
 msgstr "le certificat racine a expiré"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 msgid "intermediate certificate has expired"
 msgstr "le certificat intermédiaire a expiré"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, 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:1404
 msgid "certificate with invalid validity"
 msgstr "certificat avec validité incorrecte"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 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:1443
 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:1444
 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:1448
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (       signature créée le "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (       certificat créé le "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certificat valable depuis "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (  émetteur valable depuis "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "empreinte=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, 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:1505
 #, 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:1511
 #, 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:1570
 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:1634
 msgid "no issuer found in certificate"
 msgstr "aucun émetteur trouvé dans le certificat"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 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:1785 dirmngr/validate.c:576
 #, 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:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, 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:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr "certificat d'émetteur introuvable"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, 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:1911 dirmngr/validate.c:693
 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:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr "le certificat est correct\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "le certificat intermédiaire est correct\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, c-format
 msgid "root certificate is good\n"
 msgstr "le certificat racine est correct\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr "basculement en modèle chaîne"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr "modèle de validation utilisé : %s"
@@ -9264,7 +9271,7 @@ msgstr "hors limite\n"
 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:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "aucun"
 
@@ -9300,46 +9307,46 @@ msgstr ""
 "numéro de série %s, identifiant 0x%08lX,\n"
 "créé le %s, expire le %s.\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, 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:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, 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:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, 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:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, 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:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, 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:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "le certificat n'est pas utilisable pour le chiffrement\n"
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "le certificat n'est pas utilisable pour la signature\n"
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9903,7 +9910,7 @@ msgstr "algorithme de hachage utilisé pour le signataire %d : %s (%s)\n"
 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:916
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
@@ -10099,7 +10106,7 @@ msgstr "suppression du fichier de cache « %s »\n"
 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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "erreur de fermeture du fichier de cache : %s\n"
@@ -10364,151 +10371,151 @@ msgstr "algorithme de hachage « %s » inconnu\n"
 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:1849 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:1923
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "échec de ksba_crl_parse : %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1938
 #, 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:1945
 #, 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:1949
 #, 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:1969
 #, 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:1984
 #, 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:2011
 #, 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:2026
 #, 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:2072
 #, 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:2084
 #, 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:2226
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "échec de ksba_crl_new : %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2233
 #, 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:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "échec de crl_parse_insert : %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2301
 #, 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:2308
 #, 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:2333
 #, 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:2337
 #, 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:2353
 #, 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:2363
 #, 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:2414
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "création du fichier de cache « %s »\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, 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:2460
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10517,14 +10524,14 @@ msgstr ""
 "é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:2497
 #, 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:2520
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10532,59 +10539,59 @@ msgstr ""
 " 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:2523
 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:2526
 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:2533
 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:2551
 #, 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:2558
 #, 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:2569
 #, 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:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr "Fin du vidage de liste de révocations de certificat\n"
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "échec de crl_fetch par points de distribution : %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, 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:2779
+#: dirmngr/crlcache.c:2780
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "échec de crl_cache_insert par émetteur : %s\n"
@@ -10947,13 +10954,13 @@ msgstr "utilisation : %s [options] "
 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:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, 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:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr ""
@@ -11201,92 +11208,92 @@ msgstr "échec de hachage de la réponse OCSP pour « %s » : %s\n"
 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:582
+#: 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:598 dirmngr/ocsp.c:782
+#: 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:642
+#: 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:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "certificat d'émetteur introuvable : %s\n"
 
-#: dirmngr/ocsp.c:691
+#: 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:698
+#: 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:708
+#: 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:747
+#: 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:753
+#: 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:760
+#: 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:765
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "utilisation du répondeur OCSP « %s »\n"
 
-#: dirmngr/ocsp.c:822
+#: 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:847
+#: 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:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "correct"
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: 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:901
+#: 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:916
+#: 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"
@@ -11300,63 +11307,63 @@ msgstr "échec d'assuan_inquire(%s) : %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "échec d'assuan_inquire : %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "erreur d'envoi de données : %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "échec de start_cert_fetch : %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1776
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "échec de fetch_next_cert : %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d dépassé\n"
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "impossible d'allouer une structure de contrôle : %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "échec d'allocation du contexte Assuan : %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "impossible d'initialiser le serveur : %s\n"
 
-#: dirmngr/server.c:3062
+#: dirmngr/server.c:3078
 #, 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:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "problème d'accept_assuan : %s\n"
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "problème de traitement Assuan : %s\n"
@@ -11693,92 +11700,108 @@ msgstr ""
 "Vérifier une phrase secrète donnée sur l'entrée standard par rapport à "
 "ficmotif\n"
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: 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:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: 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:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: 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:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3707
+#: 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:3708
+#: 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:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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"
diff --git a/po/gl.gmo b/po/gl.gmo
index b147c79..cb09750 100644
--- a/po/gl.gmo
+++ b/po/gl.gmo
diff --git a/po/gl.po b/po/gl.po
index 61ab513..74d7316 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -141,8 +141,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "contrasinal erróneo"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
@@ -196,25 +196,25 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, 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:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -225,26 +225,26 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -255,39 +255,39 @@ msgstr "non se puido abrir `%s': %s\n"
 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:2467
+#: agent/command-ssh.c:2472
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, 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:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, 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:3797
+#: agent/command-ssh.c:3837
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: fallo ao crear unha táboa hash: %s\n"
@@ -419,209 +419,215 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 #, fuzzy
 msgid "Options used for startup"
 msgstr "habilitar depuración total"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "lareto"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "ser un pouquiño máis calado"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza-la base de datos de confianza"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 #, 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:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "non está soportado"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "non está soportado"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "non está soportado"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|emprega-lo modo de contrasinal N"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "emprega-lo gpg-agent"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
@@ -631,149 +637,149 @@ msgstr ""
 "Por favor, informe dos erros no programa a <gnupg-bugs@gnu.org>,\n"
 "e dos erros na traducción a <proxecto@trasno.net>.\n"
 
-#: agent/gpg-agent.c:570
+#: agent/gpg-agent.c:582
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non é válido\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, 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:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, fuzzy, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Revocación de certificado válida"
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, 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:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, 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:2406
+#: agent/gpg-agent.c:2427
 #, 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:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2853
+#: agent/gpg-agent.c:2967
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "o segredo da actualización fallou: %s\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves omitidas\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1035,7 +1041,7 @@ msgstr "fallou a comprobación da sinatura creada: %s\n"
 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:1602
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1053,52 +1059,52 @@ msgstr "o algoritmo de protección %d%s non está soportado\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1129,18 +1135,18 @@ msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "a actualización fallou: %s\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "si|sim"
 
@@ -1195,8 +1201,8 @@ msgstr ""
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1216,69 +1222,69 @@ msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
 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:432 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"
@@ -1450,12 +1456,12 @@ msgstr ""
 "Non se atoparon certificados con confianza non definida.\n"
 "\n"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "Certificado correcto"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Chave dispoñible en: "
@@ -1497,7 +1503,7 @@ msgstr "Non hai axuda dispoñible para `%s'"
 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"
@@ -1542,36 +1548,36 @@ msgstr "non se puido abrir un ficheiro: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: 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
 #, 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"
@@ -1581,92 +1587,92 @@ msgstr "gravando a chave secreta en `%s'\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: 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"
@@ -1674,13 +1680,13 @@ msgstr ""
 "carácter quoted-printable na armadura - seguramente empregouse un MTA con "
 "erros\n"
 
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "non lexible por humanos"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1689,27 +1695,27 @@ msgstr ""
 "un nome de notación só debe ter caracteres imprimibles ou espacios, e debe "
 "rematar en '='\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, 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:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1719,7 +1725,7 @@ msgstr ""
 "un nome de notación só debe ter caracteres imprimibles ou espacios, e debe "
 "rematar en '='\n"
 
-#: g10/build-packet.c:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: atopáronse datos de notación non válidos\n"
@@ -1733,7 +1739,7 @@ msgstr "erro ao pór '%s' na base de datos de confianza: %s\n"
 msgid "Enter passphrase: "
 msgstr "Introduza o contrasinal: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 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"
@@ -1751,7 +1757,7 @@ msgstr "erro lendo `%s': %s\n"
 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:2330
+#: 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"
@@ -1794,177 +1800,177 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "xerar un certificado de revocación"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1500
+#: g10/card-util.c:803 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1502
+#: g10/card-util.c:805 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 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:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Pegada dactilar:"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "non se atoparon datos OpenPGP válidos.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -1972,102 +1978,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 #, fuzzy
 msgid "Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 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:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Selección non válida.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2075,197 +2081,197 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 #, 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:1743 g10/card-util.c:1833
 #, 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:1744 g10/card-util.c:1835
 #, 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:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 #, 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:1876
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "a actualización fallou: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "saír deste menú"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 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:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3689
+#: g10/card-util.c:2262 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3690
+#: g10/card-util.c:2263 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:3691
+#: g10/card-util.c:2264 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:3692
+#: g10/card-util.c:2265 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3696
+#: g10/card-util.c:2269 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:3697
+#: g10/card-util.c:2270 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3698
+#: g10/card-util.c:2271 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 #, 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:2276
 #, 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:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 #, 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2328,9 +2334,9 @@ msgstr "chave"
 msgid "subkey"
 msgstr "Pública: "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualización fallou: %s\n"
@@ -2362,18 +2368,18 @@ msgid ""
 msgstr ""
 "forza-la cifra simétrica %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, 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"
@@ -2383,46 +2389,47 @@ msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
 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:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 msgid "using cipher %s.%s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' xa está comprimido\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, 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:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, 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:862
+#: g10/encrypt.c:853
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2431,13 +2438,13 @@ msgstr ""
 "forza-lo algoritmo de compresión %s (%d) viola as preferencias do "
 "destinatario\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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"
@@ -2465,69 +2472,80 @@ msgstr "AVISO: cifrouse a mensaxe cunha chave feble no cifrado simétrico.\n"
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2597,7 +2615,7 @@ msgstr ""
 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:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opcións de importación non válidas\n"
@@ -2681,120 +2699,120 @@ msgstr "xerar un novo par de chaves"
 msgid "quickly set a new expiration date"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocación"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro público"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "actualizar tódalas chaves dun servidor de chaves"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
@@ -2810,56 +2828,56 @@ msgstr "non facer ningún cambio"
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "crear saída con armadura en ascii"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "usar modo de texto canónico"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 #, 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:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2887,7 +2905,7 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2895,7 +2913,7 @@ msgstr ""
 "@\n"
 "(Vexa a páxina man para un listado completo de comandos e opcións)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2925,13 +2943,13 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 #, 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:1175
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2946,7 +2964,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operación por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2954,571 +2972,560 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Pública: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Compresión: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uso: gpg [opcións] "
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, 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:1708
+#: g10/gpg.c:1698
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1716
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, 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:1735
+#: g10/gpg.c:1725
 #, 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:1738
+#: g10/gpg.c:1728
 #, 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:1744
+#: g10/gpg.c:1734
 #, 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:1747
+#: g10/gpg.c:1737
 #, 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:1750
+#: g10/gpg.c:1740
 #, 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:1966
+#: g10/gpg.c:1956
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr " creouse un novo ficheiro de configuración `%s'\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro está unha chave listada"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "estabrece-la lista de preferencias"
+
+#: g10/gpg.c:2197
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, 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:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, 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:3220
+#: g10/gpg.c:3194
 #, 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:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, 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:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, 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:3355
+#: g10/gpg.c:3326
 #, 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:3358
+#: g10/gpg.c:3329
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcións de importación non válidas\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, 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:3398
+#: g10/gpg.c:3374
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, 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:3434
+#: g10/gpg.c:3410
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, 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:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s non se admite con %s!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s non ten sentido empregándoo con %s!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, 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:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non é válido\n"
 
-#: g10/gpg.c:3952
-#, 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:3964
+#: g10/gpg.c:3927
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non é válido\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, 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:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non válidas\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non válidas\n"
 
-#: g10/gpg.c:4015
-#, 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:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non válidas\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresión personais non válidas\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, 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:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "¡%s aínda non traballa con %s!\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, 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:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 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:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepción do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportación da chave fallou: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, 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:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualización no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, 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:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a súa mensaxe ...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, 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:5726
+#: g10/gpg.c:5682
 #, 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:5759
+#: g10/gpg.c:5715
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
@@ -3532,7 +3539,7 @@ msgstr "toma-las chaves deste chaveiro"
 msgid "make timestamp conflicts only a warning"
 msgstr "converte-los conflictos de selo de data nun aviso"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 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"
 
@@ -3563,335 +3570,335 @@ msgstr "Non hai axuda dispoñible"
 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:1998 g10/import.c:3146
 #, 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:2004
 #, 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:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, 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:2801
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
@@ -3904,212 +3911,212 @@ msgstr "erro ao enviar a `%s': %s\n"
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, 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:3138 g10/import.c:3177
 #, 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:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "motivo para a revocación: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "comentario de revocación: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, 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:3788
 #, 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:3812
 #, 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:3825
 #, 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:3840
 #, 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:3887
 #, 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:3914
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: omitida a sub-chave\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
@@ -4147,7 +4154,7 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "O ID de usuario \"%s\" está revocado."
 msgstr[1] "O ID de usuario \"%s\" está revocado."
 
-#: g10/key-check.c:726 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"
@@ -4155,7 +4162,7 @@ msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr[0] "1 sinatura non verificada debido a unha chave que falta\n"
 msgstr[1] "1 sinatura non verificada debido a unha chave que falta\n"
 
-#: g10/key-check.c:734 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"
@@ -4209,15 +4216,15 @@ msgstr "erro ao crear `%s': %s\n"
 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:262
 msgid "[revocation]"
 msgstr "[revocación]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[auto-sinatura]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4229,68 +4236,68 @@ msgstr ""
 "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:389 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:390 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:408
 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:425
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "O ID de usuario \"%s\" está caducado."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, 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:646
 #, 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:648
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "¿Asinar de verdade? "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4299,11 +4306,11 @@ msgstr ""
 "A auto-sinatura de \"%s\"\n"
 "é unha sinatura tipo PGP 2.x\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4312,11 +4319,11 @@ msgstr ""
 "A súa sinatura actual en \"%s\"\n"
 "caducou.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4325,43 +4332,43 @@ msgstr ""
 "A súa sinatura actual en \"%s\"\n"
 "é unha sinatura local.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "¡Esta chave caducou!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4370,32 +4377,32 @@ msgstr ""
 "¿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:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Non hei respostar.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, 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:878
 #, 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:881
 #, 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:888
 #, 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:915
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4404,281 +4411,281 @@ msgstr ""
 "¿Esta seguro de que quere asinar esta chave\n"
 "coa súa chave: \""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, 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:928
 #, 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:935
 #, 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:945
 #, 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:952
 #, 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:959
 #, 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:964
 #, 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:969
 #, 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:981
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "¿Asinar de verdade? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "gardar e saír"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Notación de sinaturas: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 #, fuzzy
 msgid "select subkey N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 #, fuzzy
 msgid "check signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "asina-la chave localmente"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, 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:1289
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "engadir unha identificación fotográfica"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "borrar un ID de usuario"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "engadir unha chave de revocación"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 #, 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:1314
 #, 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:1316
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marcar un ID de usuario coma primario"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "lista-las preferencias (expertos)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "lista-las preferencias (moitos datos)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 #, 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:1325
 #, 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:1327
 #, 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:1329
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 #, 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:1337
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar un ID de usuario"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 #, fuzzy
 msgid "enable key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 #, fuzzy
 msgid "disable key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "amosa-la identificación fotográfica"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1349
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1470
 msgid "Secret key is available.\n"
 msgstr "A chave secreta está disponible.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 #, 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:1574
 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:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4686,311 +4693,295 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "A chave está revocada."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 #, 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:1682
 #, 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:1690
 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:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 #, 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:1756
 #, 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:1814 g10/keyedit.c:1854
 #, 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, 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:1934
 #, 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:1969
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1975
 #, 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:1977
 #, 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:2015
 #, 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:2016
 #, 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:2034
 #, 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:2045
 #, 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:2047
 #, 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:2105
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2150
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 #, 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:2159
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "¿Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "¿Garda-los cambios? "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "¿Saír sin gardar? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, 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:2557
+#: g10/keyedit.c:2558
 #, 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:2583
+#: g10/keyedit.c:2584
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, 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:2677
+#: g10/keyedit.c:2717
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, 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:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "valor non válido\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Non hai tal ID de usuario.\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   asinada por %08lX no %s%s\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, 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:3211
+#: g10/keyedit.c:3251
 #, 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:3253
+#: g10/keyedit.c:3293
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Resumo: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Características: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 #, fuzzy
 msgid "Notations: "
 msgstr "Notación: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 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:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Esta chave está desactivada"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4998,19 +4989,19 @@ msgstr ""
 "Teña en conta que a validez da chave amosada non é necesariamente\n"
 "correcta a menos que reinicie o programa.\n"
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5019,18 +5010,18 @@ msgstr ""
 "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:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5039,37 +5030,37 @@ msgstr ""
 "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:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "¿Está seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura descoñecida? (s/N/q)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¿Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5077,38 +5068,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Borrada %d sinatura.\n"
 msgstr[1] "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non válida"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "O ID de usuario \"%s\" está revocado."
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "O ID de usuario \"%s\" está revocado."
 msgstr[1] "O ID de usuario \"%s\" está revocado."
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5118,45 +5109,45 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versións de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 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:4719
+#: g10/keyedit.c:4611
 #, 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:4788
+#: g10/keyedit.c:4680
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5164,184 +5155,184 @@ msgid ""
 msgstr ""
 "¿Está seguro de que quere nomear esta chave coma revocador designado? (s/N): "
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiración para a chave secundaria.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiración da chave primaria.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Cambiando a data de expiración para a chave secundaria.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 #, 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:5033
+#: g10/keyedit.c:4925
 #, 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:5039
+#: g10/keyedit.c:4931
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, 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:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "¿Está seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "¿Está seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notación de sinaturas: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "¿Sobrescribir? (s/N) "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¿Está seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:6078
+#: g10/keyedit.c:5972
 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:6138
+#: g10/keyedit.c:6032
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:6167
+#: g10/keyedit.c:6061
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "¿Realmente desexa crea-los certificados de revocación? (s/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, 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:6464
+#: g10/keyedit.c:6358
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5382,53 +5373,53 @@ msgstr "demasiadas preferencias `%c'\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "caracter non válido na cadea de preferencias\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "escribindo unha sinatura directa\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "escribindo a propia sinatura\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamaño de chave non válido; empregando %u bits\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamaño de chave redondeado a %u bits\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar datos"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr ""
 
@@ -5442,180 +5433,180 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (só cifrar)\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, 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:2136
+#: g10/keygen.c:2113
 #, 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:2142
+#: g10/keygen.c:2119
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (só cifrar)\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, 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:2150
+#: g10/keygen.c:2127
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, 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:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (por defecto)"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (só asinar)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, 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:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) RSA (só cifrar)\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notación de sinaturas: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 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:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 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:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "deshabilitar unha chave"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, 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:2570
+#: g10/keygen.c:2547
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2555
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "¿Qué tamaño de chave quere? (1024) "
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 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:2641
+#: g10/keygen.c:2618
 #, 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:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5631,7 +5622,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5647,40 +5638,40 @@ msgstr ""
 "      <n>m = a sinatura caduca en n meses\n"
 "      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "¿Por canto tempo é válida a chave? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "¿Por canto tempo é válida a sinatura? (0) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "valor non válido\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5688,12 +5679,12 @@ msgstr ""
 "O seu sistema non pode amosar datas máis aló do 2038.\n"
 "Aínda así, hase tratar correctamente ata o 2106.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "¿Isto é correcto? (s/n) "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5704,7 +5695,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 #, fuzzy
 msgid ""
 "\n"
@@ -5721,42 +5712,42 @@ msgstr ""
 "     \"Heinrich Heime (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Caracter non válido no nome\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Non é un enderezo de e-mail válido\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Carácter non válido no comentario\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, 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:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5767,12 +5758,12 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5787,35 +5778,35 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 #, 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:3148
+#: g10/keygen.c:3125
 #, 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5827,18 +5818,18 @@ msgstr ""
 "mentres se xeran os números primos; isto proporciónalle ao xerador de\n"
 "números aleatorios unha opoertunidade de acumular entropía de abondo.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeración da chave fallou: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5846,69 +5837,69 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' xa está comprimido\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "¿Crear de tódolos xeitos? "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "¿Crear de tódolos xeitos? "
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeración de chaves.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, 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:5599
+#: g10/keygen.c:5570
 #, 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:5613
+#: g10/keygen.c:5584
 #, 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:5644
+#: g10/keygen.c:5615
 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:5660
+#: g10/keygen.c:5631
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5918,7 +5909,7 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5926,7 +5917,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5934,23 +5925,23 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "¿Crear realmente? "
@@ -5959,27 +5950,43 @@ msgstr "¿Crear realmente? "
 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"
@@ -5987,7 +5994,7 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d sinaturas erróneas\n"
 msgstr[1] "%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"
@@ -5995,41 +6002,41 @@ msgid_plural "%d signatures not checked due to errors\n"
 msgstr[0] "1 sinatura non verificada debido a un erro\n"
 msgstr[1] "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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Chaveiro"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr "Pegada dactilar da chave primaria:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "     Pegada dactilar da sub-chave:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Pegada dactilar ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -6406,7 +6413,7 @@ msgstr "binario"
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "descoñecido"
 
@@ -6550,27 +6557,27 @@ msgstr "Sen comprimir"
 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:1614
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "lendo as opcións de `%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "clase de sinatura descoñecida"
@@ -6692,7 +6699,7 @@ msgid ""
 "%s"
 msgstr "%u-bits, chave %s, ID %08lX, creada %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6706,74 +6713,74 @@ msgstr ""
 "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:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduza o nome do ficheiro JPEG: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, 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:239
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:241
 #, 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:257
 #, 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:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "¿É esta foto correcta (s/N/q)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, 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:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, 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:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6781,7 +6788,7 @@ msgstr ""
 "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:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "¡non se pode amosa-la identificación fotográfica!\n"
@@ -7116,12 +7123,12 @@ msgstr "destinatario por defecto `%s' descoñecido\n"
 msgid "no valid addressees\n"
 msgstr "non hai enderezos válidos\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
@@ -8177,7 +8184,7 @@ msgstr ""
 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"
@@ -8207,14 +8214,14 @@ msgstr "por favor, execute con --check-trustdb\n"
 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"
 msgstr[0] "%lu chaves procesadas hasta polo momento\n"
 msgstr[1] "%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"
@@ -8222,23 +8229,23 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "procesáronse %d chaves (marcáronse %d contas de validez)\n"
 msgstr[1] "procesáronse %d chaves (marcáronse %d contas de validez)\n"
 
-#: g10/trustdb.c: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"
@@ -8368,7 +8375,7 @@ msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8376,7 +8383,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8412,7 +8419,7 @@ msgstr "cambia-lo contrasinal"
 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:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8498,75 +8505,75 @@ msgstr[1] "A xeración da chave fallou: %s\n"
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-nks.c:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1654
+#: 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:1701
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2074
+#: 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:2082
+#: 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:2092
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2102
+#: 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:2104
+#: 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:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -8832,13 +8839,13 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8847,11 +8854,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:199 sm/certchain.c:2211
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 #, fuzzy
 msgid "shell"
 msgstr "axuda"
@@ -8875,248 +8882,248 @@ msgstr ""
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, 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:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:818
 #, 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:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, 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:1260 sm/certchain.c:1264
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: a chave está revocada"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, 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:1337 sm/certchain.c:1422
 #, 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:1338 sm/certchain.c:1423
 #, 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:1351 dirmngr/validate.c:527
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1404
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "problema de lectura do certificado: %s\n"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "         novas sinaturas: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Creouse o certificado de revocación.\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Pegada dactilar:"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, 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:1505
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1511
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "Certificado correcto"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1785 dirmngr/validate.c:576
 #, 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:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, 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:1844 dirmngr/validate.c:643
 #, 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:1879 dirmngr/validate.c:669
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verificar unha sinatura"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1911 dirmngr/validate.c:693
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "Revocación de certificado válida"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certificado duplicado - borrado"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, 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:2198
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9139,7 +9146,7 @@ msgstr "non procesado"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "non|nom"
@@ -9175,42 +9182,42 @@ msgstr ""
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "bad certificate"
 msgid "looking for another certificate\n"
@@ -9771,7 +9778,7 @@ msgstr ""
 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:916
 #, 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"
@@ -9965,7 +9972,7 @@ msgstr "fallou o borrado do bloque de chaves: %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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -10217,203 +10224,203 @@ msgstr "algoritmo de hash non válido `%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1849 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:1923
 #, 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:1938
 #, 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:1945
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, 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:1984
 #, 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:2011
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "Certificado correcto"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, 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:2084
 #, 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:2226
 #, 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:2233
 #, 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:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, 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:2301
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "escribindo a `%s'\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2308
 #, 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:2333
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2414
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, 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:2460
 #, 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:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 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:2523
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, 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:2558
 #, 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:2569
 #, 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:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "a actualización fallou: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, 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:2779
+#: dirmngr/crlcache.c:2780
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
@@ -10777,12 +10784,12 @@ msgstr "uso: gpg [opcións] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "¡%s non se admite con %s!\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
@@ -11031,92 +11038,92 @@ msgstr "o cambio de permisos de `%s' fallou: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:582
+#: 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:598 dirmngr/ocsp.c:782
+#: 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:642
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "Revocación de certificado válida"
 
-#: dirmngr/ocsp.c:691
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:698
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "Certificado correcto"
 
-#: dirmngr/ocsp.c:708
+#: 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:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:753
+#: 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:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:765
+#: dirmngr/ocsp.c:777
 #, fuzzy, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: dirmngr/ocsp.c:822
+#: 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:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11130,64 +11137,64 @@ msgstr "fallou a sinatura: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, 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:1776
 #, 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:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, 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:3054
+#: dirmngr/server.c:3070
 #, 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:3062
+#: dirmngr/server.c:3078
 #, 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:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11506,87 +11513,101 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Creouse o certificado de revocación.\n"
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: 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:3706
+#: 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:3707
+#: 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:3708
+#: 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:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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"
@@ -13225,9 +13246,6 @@ msgstr ""
 #~ msgid "delete signatures"
 #~ msgstr "borrar sinaturas"
 
-#~ msgid "set preference list"
-#~ msgstr "estabrece-la lista de preferencias"
-
 #~ msgid "updated preferences"
 #~ msgstr "preferencias actualizadas"
 
diff --git a/po/gnupg2.pot b/po/gnupg2.pot
index 93a3e7c..c112f6d 100644
--- a/po/gnupg2.pot
+++ b/po/gnupg2.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.3.8\n"
+"Project-Id-Version: GNU gnupg 2.4.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -137,8 +137,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr ""
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
@@ -187,24 +187,24 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr ""
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr ""
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr ""
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -215,25 +215,25 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr ""
@@ -243,39 +243,39 @@ msgstr ""
 msgid "no suitable card key found: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, 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:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr ""
 
-#: agent/command-ssh.c:3100
+#: agent/command-ssh.c:3105
 #, 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:3797
+#: agent/command-ssh.c:3837
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr ""
@@ -394,339 +394,343 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 msgid "|FILE|read options from FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr ""
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 msgid "do not use the SCdaemon"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 msgid "|NAME|accept some commands via NAME"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 msgid "enable ssh support"
 msgstr ""
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 msgid "enable putty support"
 msgstr ""
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+msgid "enable Win32-OpenSSH support"
+msgstr ""
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 msgid "disallow the use of an external password cache"
 msgstr ""
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 msgid "allow presetting passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 msgid "|N|expire the passphrase after N days"
 msgstr ""
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 msgid "do not allow the reuse of old passphrases"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: 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:570
+#: agent/gpg-agent.c:582
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr ""
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2853
+#: agent/gpg-agent.c:2967
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -970,7 +974,7 @@ msgstr ""
 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:1602
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr ""
@@ -985,52 +989,52 @@ msgstr ""
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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 ""
@@ -1060,18 +1064,18 @@ msgstr ""
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr ""
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr ""
 
@@ -1125,8 +1129,8 @@ msgstr ""
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr ""
@@ -1146,67 +1150,67 @@ msgstr ""
 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:432 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 ""
@@ -1354,11 +1358,11 @@ msgstr ""
 msgid "Root certificate trustworthy"
 msgstr ""
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 msgid "no CRL found for certificate"
 msgstr ""
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 msgid "the available CRL is too old"
 msgstr ""
 
@@ -1395,7 +1399,7 @@ msgstr ""
 msgid "ignoring garbage line"
 msgstr ""
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "[none]"
 msgstr ""
 
@@ -1439,36 +1443,36 @@ msgstr ""
 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
 #, 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 ""
@@ -1478,135 +1482,135 @@ msgstr ""
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: 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:1462
+#: g10/build-packet.c:1480
 #, c-format
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr ""
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr ""
 
-#: g10/build-packet.c:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr ""
 
-#: g10/build-packet.c:1550
+#: g10/build-packet.c:1568
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
-#: g10/build-packet.c:1606
+#: g10/build-packet.c:1624
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr ""
 
-#: g10/build-packet.c:1612
+#: g10/build-packet.c:1630
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr ""
 
-#: g10/build-packet.c:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr ""
@@ -1620,7 +1624,7 @@ msgstr ""
 msgid "Enter passphrase: "
 msgstr ""
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 g10/sign.c:473
 #: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
@@ -1637,7 +1641,7 @@ msgstr ""
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2330
+#: 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 ""
@@ -1675,169 +1679,169 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr ""
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr ""
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1500
+#: g10/card-util.c:803 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1502
+#: g10/card-util.c:805 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr ""
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr ""
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr ""
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr ""
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1296
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1297
 msgid "not an OpenPGP card"
 msgstr ""
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1395
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -1845,99 +1849,99 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr ""
 
-#: g10/card-util.c:1444 g10/keygen.c:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: sm/certreqgen-ui.c:195
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/card-util.c:1452 g10/keygen.c:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 msgid "Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 msgid "Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr ""
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr ""
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2429
+#: g10/card-util.c:1694 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1945,176 +1949,176 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 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:1743 g10/card-util.c:1833
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1744 g10/card-util.c:1835
 msgid "   (2) Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 msgid "Please select where to store the key:\n"
 msgstr ""
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1876
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 msgid "Continue? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr ""
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2228
 #, c-format
 msgid "error for setup UIF: %s\n"
 msgstr ""
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr ""
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr ""
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr ""
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr ""
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3689
+#: g10/card-util.c:2262 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr ""
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr ""
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr ""
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr ""
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3698
+#: g10/card-util.c:2271 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr ""
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2276
 msgid "change the key attribute"
 msgstr ""
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 tools/gpg-card.c:3763
 msgid "change the User Interaction Flag"
 msgstr ""
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 msgid "Admin-only command\n"
 msgstr ""
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/decrypt.c:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2172,9 +2176,9 @@ msgstr ""
 msgid "subkey"
 msgstr ""
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
@@ -2205,18 +2209,18 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr ""
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, c-format
 msgid "cipher algorithm '%s' may not be used for encryption\n"
 msgstr ""
 
-#: g10/encrypt.c:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2226,55 +2230,55 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr ""
 
-#: g10/encrypt.c:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr ""
 
-#: g10/encrypt.c:481
+#: g10/encrypt.c:473
 #, 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:512
+#: g10/encrypt.c:503
 #, c-format
 msgid "using cipher %s.%s\n"
 msgstr ""
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr ""
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr ""
 
-#: g10/encrypt.c:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/encrypt.c:862
+#: g10/encrypt.c:853
 #, c-format
 msgid "reading from '%s'\n"
 msgstr ""
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr ""
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, c-format
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr ""
 
-#: g10/encrypt.c:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2300,61 +2304,69 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr ""
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2418,7 +2430,7 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 
-#: g10/getkey.c:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr ""
@@ -2491,111 +2503,111 @@ msgstr ""
 msgid "quickly set a new expiration date"
 msgstr ""
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr ""
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr ""
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "quickly sign a key"
 msgstr ""
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 msgid "quickly sign a key locally"
 msgstr ""
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "quickly revoke a key signature"
 msgstr ""
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr ""
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr ""
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr ""
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr ""
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr ""
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr ""
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr ""
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr ""
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 msgid "print message digests"
 msgstr ""
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr ""
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
@@ -2611,51 +2623,51 @@ msgstr ""
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr ""
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 msgid "import missing key from a signature"
 msgstr ""
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 msgid "include the public key in signatures"
 msgstr ""
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2679,13 +2691,13 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2697,571 +2709,560 @@ msgid ""
 " --fingerprint [names]      show fingerprints\n"
 msgstr ""
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr ""
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1172
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 msgstr ""
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
 msgstr ""
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr ""
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr ""
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1698
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1735
+#: g10/gpg.c:1725
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1738
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1744
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1747
+#: g10/gpg.c:1737
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1750
+#: g10/gpg.c:1740
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1966
+#: g10/gpg.c:1956
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 msgid "show key usage information during key listings"
 msgstr ""
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+msgid "show preferences"
+msgstr ""
+
+#: g10/gpg.c:2197
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/gpg.c:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr ""
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr ""
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr ""
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr ""
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr ""
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr ""
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr ""
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr ""
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr ""
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr ""
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr ""
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr ""
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr ""
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr ""
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3952
-#, c-format
-msgid "selected AEAD algorithm is invalid\n"
-msgstr ""
-
-#: g10/gpg.c:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:3954
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3993
+#: g10/gpg.c:3956
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3997
+#: g10/gpg.c:3960
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:4001
+#: g10/gpg.c:3964
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr ""
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:4015
-#, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr ""
-
-#: g10/gpg.c:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr ""
 
-#: g10/gpg.c:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr ""
 
-#: g10/gpg.c:4137
-#, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr ""
-
-#: g10/gpg.c:4149
+#: g10/gpg.c:4097
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:4388
+#: g10/gpg.c:4336
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4420
+#: g10/gpg.c:4368
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4426
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4481
+#: g10/gpg.c:4429
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr ""
 
-#: g10/gpg.c:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
@@ -3274,7 +3275,7 @@ msgstr ""
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr ""
 
@@ -3301,324 +3302,324 @@ msgstr ""
 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:1998 g10/import.c:3146
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr ""
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, c-format
 msgid "key %s: %s\n"
 msgstr ""
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr ""
 
-#: g10/import.c:2017
+#: g10/import.c:2075
 #, 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:2086 g10/import.c:2117
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr ""
 
-#: g10/import.c:2030
+#: g10/import.c:2088
 #, 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:2167 g10/import.c:3533
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr ""
 
-#: g10/import.c:2115
+#: g10/import.c:2173
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr ""
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr ""
 
-#: g10/import.c:2182
+#: g10/import.c:2240
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr ""
 
-#: g10/import.c:2209
+#: g10/import.c:2267
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr ""
 
-#: g10/import.c:2277
+#: g10/import.c:2335
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:2280
+#: g10/import.c:2338
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:2283
+#: g10/import.c:2341
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr ""
 
-#: g10/import.c:2286
+#: g10/import.c:2344
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr ""
 
-#: g10/import.c:2289
+#: g10/import.c:2347
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:2292
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:2295
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr ""
 
-#: g10/import.c:2298
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr ""
 
-#: g10/import.c:2301
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr ""
 
-#: g10/import.c:2304
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr ""
 
-#: g10/import.c:2340
+#: g10/import.c:2398
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr ""
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2785 g10/import.c:2980
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr ""
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr ""
 
-#: g10/import.c:2732
+#: g10/import.c:2801
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr ""
@@ -3631,197 +3632,197 @@ msgstr ""
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr ""
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3138 g10/import.c:3177
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr ""
 
-#: g10/import.c:3096
+#: g10/import.c:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr ""
 
-#: g10/import.c:3387 g10/keylist.c:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr ""
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr ""
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:3485
+#: g10/import.c:3555
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 
-#: g10/import.c:3492
+#: g10/import.c:3562
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 
-#: g10/import.c:3512
+#: g10/import.c:3582
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:3547
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:3633
+#: g10/import.c:3703
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:3650
+#: g10/import.c:3720
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/import.c:3652
+#: g10/import.c:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:3670
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr ""
 
-#: g10/import.c:3684
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:3699
+#: g10/import.c:3769
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:3718
+#: g10/import.c:3788
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr ""
 
-#: g10/import.c:3742
+#: g10/import.c:3812
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 
-#: g10/import.c:3755
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:3770
+#: g10/import.c:3840
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:3814
+#: g10/import.c:3887
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr ""
 
-#: g10/import.c:3841
+#: g10/import.c:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr ""
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:3884
+#: g10/import.c:3957
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:3902
+#: g10/import.c:3985
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:3916
+#: g10/import.c:4009
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:3924
+#: g10/import.c:4017
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:4097
+#: g10/import.c:4190
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:4204
+#: g10/import.c:4297
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr ""
 
-#: g10/import.c:4269
+#: g10/import.c:4362
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 
-#: g10/import.c:4285
+#: g10/import.c:4378
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 
-#: g10/import.c:4351
+#: g10/import.c:4444
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:4389
+#: g10/import.c:4482
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr ""
@@ -3858,14 +3859,14 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/key-check.c:726 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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/key-check.c:734 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"
@@ -3916,15 +3917,15 @@ msgstr ""
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[revocation]"
 msgstr ""
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr ""
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -3932,389 +3933,389 @@ msgid ""
 "etc.)\n"
 msgstr ""
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 g10/pkclist.c:289
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr ""
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:390 g10/pkclist.c:291
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr ""
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:408
 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:425
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr ""
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr ""
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr ""
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, 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:684
 msgid "Do you want to promote it to an OpenPGP self-signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr ""
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:748
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:758
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:804
 msgid "This key has expired!"
 msgstr ""
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 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:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:881
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr ""
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:888
 msgid "Your selection? (enter '?' for more information): "
 msgstr ""
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, 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:923
 msgid "This will be a self-signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:945
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:952
 msgid "The signature will be marked as non-revocable.\n"
 msgstr ""
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "I have not checked this key at all.\n"
 msgstr ""
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 msgid "I have checked this key casually.\n"
 msgstr ""
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 msgid "I have checked this key very carefully.\n"
 msgstr ""
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:981
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1152
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "save and quit"
 msgstr ""
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 msgid "show key fingerprint"
 msgstr ""
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "show the keygrip"
 msgstr ""
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr ""
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr ""
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "sign selected user IDs locally"
 msgstr ""
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "add a user ID"
 msgstr ""
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr ""
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 msgid "delete selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr ""
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1314
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1316
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr ""
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr ""
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 msgid "set preference list for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1325
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1327
 msgid "set a notation for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1329
 msgid "change the passphrase"
 msgstr ""
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 msgid "revoke signatures on the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 msgid "revoke selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "enable key"
 msgstr ""
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr ""
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1349
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1470
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 msgid "Secret subkeys are available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1574
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4322,597 +4323,581 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr ""
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Really sign all text user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1682
 msgid "Really sign all user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1690
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1701
 #, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr ""
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1755
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 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:1814 g10/keyedit.c:1854
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 msgid "You must select exactly one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr ""
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1969
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1975
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Do you really want to delete this key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2015
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2016
 msgid "Really revoke this user ID? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2034
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2045
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2047
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2105
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2150
 msgid "Set preference list to:\n"
 msgstr ""
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2159
 msgid "Really update the preferences? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Save changes? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2557
+#: g10/keyedit.c:2558
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2584
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2677
+#: g10/keyedit.c:2717
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr ""
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr ""
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "No matching user IDs."
 msgstr ""
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "Nothing to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3251
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr ""
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr ""
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr ""
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr ""
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr ""
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr ""
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3735
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:3867
+#: g10/keyedit.c:3759
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr ""
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr ""
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr ""
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, 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:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr ""
 
-#: g10/keyedit.c:4313
+#: g10/keyedit.c:4205
 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:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4324
+#: g10/keyedit.c:4216
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4231
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr ""
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr ""
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr ""
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 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:4614
+#: g10/keyedit.c:4506
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4673
+#: g10/keyedit.c:4565
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4587
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4605
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4611
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4788
+#: g10/keyedit.c:4680
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr ""
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:4912
+#: g10/keyedit.c:4804
 msgid "Changing usage of a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 msgid "Changing usage of the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:5033
+#: g10/keyedit.c:4925
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5039
+#: g10/keyedit.c:4931
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 msgid "Proceed? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr ""
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:6426
+#: g10/keyedit.c:6320
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -4952,51 +4937,51 @@ msgstr ""
 msgid "invalid item '%s' in preference string\n"
 msgstr ""
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr ""
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr ""
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr ""
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr ""
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr ""
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr ""
 
@@ -5010,166 +4995,166 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr ""
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr ""
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr ""
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, c-format
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2113
 #, c-format
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2142
+#: g10/keygen.c:2119
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, c-format
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2127
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, c-format
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr ""
 
-#: g10/keygen.c:2167
+#: g10/keygen.c:2144
 #, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr ""
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr ""
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr ""
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr ""
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr ""
 
-#: g10/keygen.c:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr ""
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:2570
+#: g10/keygen.c:2547
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2555
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr ""
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:2641
+#: g10/keygen.c:2618
 msgid "Please select which elliptic curve you want:\n"
 msgstr ""
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5179,7 +5164,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5189,48 +5174,48 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr ""
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr ""
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr ""
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5241,7 +5226,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5251,41 +5236,41 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5293,11 +5278,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
-#: g10/keygen.c:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5312,31 +5297,31 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:3142
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:3147
+#: g10/keygen.c:3124
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:3148
+#: g10/keygen.c:3125
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5344,18 +5329,18 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5363,97 +5348,97 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr ""
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 msgid "Create anyway? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, c-format
 msgid "creating anyway\n"
 msgstr ""
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr ""
 
-#: g10/keygen.c:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr ""
 
-#: g10/keygen.c:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 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:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keygen.c:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr ""
 
-#: g10/keygen.c:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr ""
 
@@ -5461,74 +5446,90 @@ msgstr ""
 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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: 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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: 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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr ""
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr ""
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr ""
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -5892,7 +5893,7 @@ msgstr ""
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr ""
 
@@ -6026,27 +6027,27 @@ msgstr ""
 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:1614
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr ""
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr ""
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr ""
@@ -6155,7 +6156,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6164,75 +6165,75 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:100
+#: g10/photoid.c:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr ""
 
-#: g10/photoid.c:132
+#: g10/photoid.c:239
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:241
 msgid "Are you sure you want to use it? (y/N) "
 msgstr ""
 
-#: g10/photoid.c:150
+#: g10/photoid.c:257
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr ""
 
-#: g10/photoid.c:169
+#: g10/photoid.c:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr ""
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/photoid.c:486
+#: g10/photoid.c:593
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 
-#: g10/photoid.c:506
+#: g10/photoid.c:613
 #, c-format
 msgid "unable to execute shell '%s': %s\n"
 msgstr ""
 
-#: g10/photoid.c:517 g10/photoid.c:594
+#: g10/photoid.c:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr ""
 
-#: g10/photoid.c:600
+#: g10/photoid.c:707
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr ""
 
-#: g10/photoid.c:604
+#: g10/photoid.c:711
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr ""
 
-#: g10/photoid.c:635
+#: g10/photoid.c:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr ""
@@ -6530,12 +6531,12 @@ msgstr ""
 msgid "no valid addressees\n"
 msgstr ""
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr ""
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr ""
@@ -7523,7 +7524,7 @@ msgstr ""
 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 ""
@@ -7553,37 +7554,37 @@ msgstr ""
 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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: 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 ""
@@ -7701,7 +7702,7 @@ msgstr ""
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -7709,7 +7710,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -7739,7 +7740,7 @@ msgstr ""
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr ""
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -7824,68 +7825,68 @@ msgstr[1] ""
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 msgid "|A|Please enter the Admin PIN"
 msgstr ""
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 scd/app-nks.c:2098
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 
-#: scd/app-p15.c:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr ""
 
-#: scd/app-nks.c:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1654
+#: scd/app-nks.c:1656
 msgid "Note: PIN has not yet been enabled."
 msgstr ""
 
-#: scd/app-nks.c:1701
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2074
+#: scd/app-nks.c:2088
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr ""
 
-#: scd/app-nks.c:2082
+#: scd/app-nks.c:2096
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 
-#: scd/app-nks.c:2092
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2102
+#: 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:2104
+#: 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:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr ""
@@ -8137,13 +8138,13 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8152,11 +8153,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:199 sm/certchain.c:2211
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 msgid "shell"
 msgstr ""
 
@@ -8179,234 +8180,234 @@ msgstr ""
 msgid "failed to open '%s': %s\n"
 msgstr ""
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr ""
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr ""
 
-#: sm/certchain.c:792
+#: sm/certchain.c:793
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:818
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr ""
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr ""
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1260 sm/certchain.c:1264
 msgid "certificate has been revoked"
 msgstr ""
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1292
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr ""
 
-#: sm/certchain.c:1290 sm/certchain.c:1358 dirmngr/validate.c:498
+#: sm/certchain.c:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 msgid "root certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr ""
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 msgid "root certificate has expired"
 msgstr ""
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 msgid "intermediate certificate has expired"
 msgstr ""
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1404
 msgid "certificate with invalid validity"
 msgstr ""
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, c-format
 msgid "  (  signature created at "
 msgstr ""
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, c-format
 msgid "  (certificate created at "
 msgstr ""
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, c-format
 msgid "  (certificate valid from "
 msgstr ""
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr ""
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1505
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1511
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 msgid "no issuer found in certificate"
 msgstr ""
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr ""
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1911 dirmngr/validate.c:693
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr ""
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr ""
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, c-format
 msgid "root certificate is good\n"
 msgstr ""
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -8429,7 +8430,7 @@ msgstr ""
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr ""
 
@@ -8459,42 +8460,42 @@ msgid ""
 "created %s, expires %s.\n"
 msgstr ""
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, c-format
 msgid "looking for another certificate\n"
 msgstr ""
@@ -9028,7 +9029,7 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr ""
@@ -9217,7 +9218,7 @@ msgstr ""
 msgid "not removing file '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr ""
@@ -9461,197 +9462,197 @@ msgstr ""
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1849 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1923
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1938
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1945
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1984
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2011
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2084
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2226
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2233
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2267
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2271
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2291
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2308
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2333
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2414
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2460
 #, 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:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 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:2523
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2558
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2569
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2600
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2603
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr ""
@@ -9983,12 +9984,12 @@ msgstr ""
 msgid "colons are not allowed in the socket name\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr ""
@@ -10232,91 +10233,91 @@ msgstr ""
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:582
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:598 dirmngr/ocsp.c:782
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:642
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:691
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:698
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:708
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:753
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:765
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:822
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:854
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -10330,63 +10331,63 @@ msgstr ""
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, c-format
 msgid "error sending data: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1776
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3062
+#: dirmngr/server.c:3078
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr ""
@@ -10685,76 +10686,76 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2421
+#: tools/gpg-card.c:2425
 #, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr ""
 
-#: tools/gpg-card.c:2424
+#: tools/gpg-card.c:2428
 #, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr ""
 
-#: tools/gpg-card.c:2427
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: tools/gpg-card.c:3758
 msgid "authenticate to the card"
 msgstr ""
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr ""
 
-#: tools/gpg-card.c:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3707
+#: tools/gpg-card.c:3765
 msgid "read a certificate from a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3708
+#: tools/gpg-card.c:3766
 msgid "store a certificate to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr ""
diff --git a/po/hu.gmo b/po/hu.gmo
index 471dcbf..d4b2a04 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index bc507e6..25b8e25 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.2.20\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2020-06-09 23:10+0200\n"
 "Last-Translator: Nagy Ferenc László <nfl@nfllab.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -140,8 +140,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "rossz jelszó"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
@@ -195,25 +195,25 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "jelszóváltoztatás"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, 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:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -224,26 +224,26 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -254,39 +254,39 @@ msgstr "Nem tudom megnyitni a(z) \"%s\" állományt: %s.\n"
 msgid "no suitable card key found: %s\n"
 msgstr "Nem írható titkoskulcs-karikát találtam: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, 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:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, 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:3797
+#: agent/command-ssh.c:3837
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
@@ -417,208 +417,214 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "jelszóváltoztatás"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "bőbeszédű mód"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "még szűkszavúbb mód"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "bizalmi adatbázis frissítése"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 #, 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:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "nem támogatott"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "nem támogatott"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "nem támogatott"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|N. sorszámú jelszómód használata"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "gpg ügynök használata"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
@@ -626,149 +632,149 @@ msgstr ""
 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:570
+#: agent/gpg-agent.c:582
 #, 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:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, 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:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s nem hozható létre: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, 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:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, 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:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "�rom a titkos kulcsot a %s állományba.\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, 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:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: Könyvtárat létrehoztam.\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, 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:2406
+#: agent/gpg-agent.c:2427
 #, 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:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2853
+#: agent/gpg-agent.c:2967
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1030,7 +1036,7 @@ msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 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:1602
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1048,52 +1054,52 @@ msgstr "%d%s védő algoritmus nem támogatott.\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1124,18 +1130,18 @@ msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "igen"
 
@@ -1190,8 +1196,8 @@ msgstr ""
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1211,69 +1217,69 @@ msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 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:432 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"
@@ -1441,12 +1447,12 @@ msgstr "Ez a kulcs lejárt!"
 msgid "Root certificate trustworthy"
 msgstr "rossz igazolás"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "rossz igazolás"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kulcs található: "
@@ -1488,7 +1494,7 @@ msgstr "Nem áll rendelkezésre segítség \"%s\" témához."
 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ú"
@@ -1533,36 +1539,36 @@ msgstr "Nem tudom megnyitni az állományt: %s.\n"
 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
 #, 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"
@@ -1572,105 +1578,105 @@ msgstr "�rom a titkos kulcsot a %s állományba.\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: 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:1462
+#: g10/build-packet.c:1480
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "nem olvasható forma"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1679,27 +1685,27 @@ msgstr ""
 "Egy jelölés neve csak nyomtatható karaktereket és szóközt tartalmazhat, és = "
 "jellel kell befejeződjön.\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, 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:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1709,7 +1715,7 @@ msgstr ""
 "Egy jelölés neve csak nyomtatható karaktereket és szóközt tartalmazhat, és = "
 "jellel kell befejeződjön.\n"
 
-#: g10/build-packet.c:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "FIGYELEM: Érvénytelen jelölő adatot találtam.\n"
@@ -1723,7 +1729,7 @@ msgstr ""
 msgid "Enter passphrase: "
 msgstr "�rja be a jelszót: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 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"
@@ -1741,7 +1747,7 @@ msgstr "Hiba \"%s\" olvasásakor: %s\n"
 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:2330
+#: 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"
@@ -1784,177 +1790,177 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "visszavonási igazolás készítése"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1500
+#: g10/card-util.c:803 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1502
+#: g10/card-util.c:805 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenciák frissítése"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 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:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Nem találtam érvényes OpenPGP adatot.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -1962,102 +1968,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 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:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Érvénytelen választás.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2065,197 +2071,197 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 #, 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:1743 g10/card-util.c:1833
 #, 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:1744 g10/card-util.c:1835
 #, 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:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 #, 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:1876
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 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:2254
 #, fuzzy
 msgid "show admin commands"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 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:3685
+#: g10/card-util.c:2257 tools/gpg-card.c:3743
 #, fuzzy
 msgid "list all available data"
 msgstr "Kulcs található: "
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3689
+#: g10/card-util.c:2262 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3690
+#: g10/card-util.c:2263 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:3691
+#: g10/card-util.c:2264 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:3692
+#: g10/card-util.c:2265 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3696
+#: g10/card-util.c:2269 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:3697
+#: g10/card-util.c:2270 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3698
+#: g10/card-util.c:2271 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 #, 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:2276
 #, 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:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 #, 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, 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:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 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 +2323,9 @@ msgstr "key"
 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:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
@@ -2350,19 +2356,19 @@ 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:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2373,61 +2379,62 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 
-#: g10/encrypt.c:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "%s rejtjelezést használok.\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, 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:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, 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:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, 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:862
+#: g10/encrypt.c:853
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "Olvasok a \"%s\" állományból.\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, 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:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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"
@@ -2456,69 +2463,80 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "FIGYELEM: Semmit sem exportáltam.\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2589,7 +2607,7 @@ msgstr ""
 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:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "Érvénytelen import opciók!\n"
@@ -2673,120 +2691,120 @@ msgstr "új kulcspár létrehozása"
 msgid "quickly set a new expiration date"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "visszavonási igazolás készítése"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "kulcsok eltávolítása a nyilvánoskulcs-karikáról"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok eltávolítása a titkoskulcs-karikáról"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "kulcs aláírása"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "kulcs aláírása helyileg"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "kulcs aláírása"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "kulcs aláírása helyileg"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "kulcs aláírása vagy szerkesztése"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "jelszóváltoztatás"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "kulcsok exportálása"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "kulcsok exportálása kulcsszerverre"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "kulcsok importálása kulcsszerverről"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "kulcsok keresése kulcsszerveren"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs frissítése kulcsszerverről"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "kulcsok importálása/összefűzése"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "bizalmi adatbázis frissítése"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [fájlok]|üzenet kivonatának kiírása"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NÉV|titkosítás NÉV részére"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
@@ -2802,56 +2820,56 @@ msgstr "ne csináljon semmi változtatást"
 msgid "prompt before overwriting"
 msgstr "felülírás előtt rákérdezés"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "ascii páncélozott kimenet létrehozása"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "kanonikus szöveges mód használata"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 #, 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:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "kulcsok importálása kulcsszerverről"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "kulcsaláírások ellenőrzése"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2879,7 +2897,7 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2887,7 +2905,7 @@ msgstr ""
 "@\n"
 "(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2917,13 +2935,13 @@ msgstr ""
 " --list-keys [nevek]        kulcsok kiíratása\n"
 " --fingerprint [nevek]      ujjlenyomatok kiíratása\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 #, 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:1175
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2938,7 +2956,7 @@ msgstr ""
 "Aláírás, ellenőrzés, titkosítás vagy visszafejtés.\n"
 "Az alapértelmezett művelet a bemeneti adattól függ.\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2946,572 +2964,560 @@ msgstr ""
 "\n"
 "Támogatott algoritmusok:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Nyilvános kulcsú (pubkey): "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Rejtjelező (cipher): "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Kivonatoló (hash): "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Tömörítő (compression): "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "Használat: gpg [opciók] "
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, 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:1708
+#: g10/gpg.c:1698
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, 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:1726
+#: g10/gpg.c:1716
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, 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:1735
+#: g10/gpg.c:1725
 #, 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:1738
+#: g10/gpg.c:1728
 #, 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:1744
+#: g10/gpg.c:1734
 #, 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:1747
+#: g10/gpg.c:1737
 #, 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:1750
+#: g10/gpg.c:1740
 #, 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:1966
+#: g10/gpg.c:1956
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 #, 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:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilistázott kulcs kulcskarikáját is"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "preferencialista beállítása"
+
+#: g10/gpg.c:2197
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, 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:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, 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:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 #, 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:3420
+#: g10/gpg.c:3396
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, 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:3648
+#: g10/gpg.c:3621
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, 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:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hatástalanítja %s-t!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s és %s nem használható együtt!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s értelmetlen %s mellett!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, 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:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3952
-#, 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:3964
+#: g10/gpg.c:3927
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazoláshoz kiválasztott kivonatoló algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-nál!\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-nél!\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "Érvénytelen alapértelmezett preferenciák!\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "Érvénytelen személyes rejtjelező-preferenciák!\n"
 
-#: g10/gpg.c:4015
-#, 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:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "Érvénytelen személyes kivonatolópreferenciák!\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "Érvénytelen személyes tömörítőpreferenciák!\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, 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:4074
+#: g10/gpg.c:4034
 #, 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:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "Visszafejtés sikertelen: %s.\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Vétel a kulcsszerverről sikertelen: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexportálás sikertelen: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, 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:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keresés a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Frissítés a kulcsszerverről sikertelen: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Páncél eltávolítása nem sikerült: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, 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:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti gépelni az üzenetet...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, 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:5726
+#: g10/gpg.c:5682
 #, 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:5759
+#: g10/gpg.c:5715
 #, 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 +3531,7 @@ msgstr "a megadott kulcskarikáról vegye a kulcsokat"
 msgid "make timestamp conflicts only a warning"
 msgstr "időbélyeg-konfliktus esetén csak figyelmeztessen"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 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,335 +3562,335 @@ msgstr "Nem áll rendelkezésre segítség."
 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:1998 g10/import.c:3146
 #, 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:2004
 #, 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:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "%08lX kulcs: új kulcs - kihagytam.\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, 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:2793
 #, 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:2801
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
@@ -3897,204 +3903,204 @@ msgstr "Hiba %s-ra/-re küldéskor: %s\n"
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, 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:3138 g10/import.c:3177
 #, 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:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "Visszavonás oka: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "Megjegyzés a visszavonáshoz: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, 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:3788
 #, 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:3812
 #, 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:3825
 #, 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:3840
 #, 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:3887
 #, 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:3914
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%08lX kulcs: Kulcsaláírást hozzáadtam.\n"
@@ -4132,7 +4138,7 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "\"%s\" felhasználói azonosítót visszavonták."
 msgstr[1] "\"%s\" felhasználói azonosítót visszavonták."
 
-#: g10/key-check.c:726 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 +4146,7 @@ msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr[0] "1 aláírást nem ellenőriztem hiányzó kulcs miatt.\n"
 msgstr[1] "1 aláírást nem ellenőriztem hiányzó kulcs miatt.\n"
 
-#: g10/key-check.c:734 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"
@@ -4194,15 +4200,15 @@ msgstr "Hiba \"%s\" létrehozásakor: %s\n"
 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:262
 msgid "[revocation]"
 msgstr "[visszavonás]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[önaláírás]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4215,68 +4221,68 @@ msgstr ""
 "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:389 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:390 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:408
 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:425
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  Nem tudom aláírni.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "\"%s\" felhasználói azonosító lejárt."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, 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:646
 #, 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:648
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Valóban aláírja? "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4285,11 +4291,11 @@ msgstr ""
 "\"%s\" önaláírása\n"
 "PGP 2.x stílusú.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4298,11 +4304,11 @@ msgstr ""
 "Az Ön jelenlegi aláírása a(z) \"%s\"\n"
 "kulcson lejárt.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4311,43 +4317,43 @@ msgstr ""
 "Az Ön jelenlegi aláírása a(z) \"%s\"\n"
 "kulcson helyi aláírás.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "Ez a kulcs lejárt!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4356,32 +4362,32 @@ msgstr ""
 "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:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Nem válaszolok.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, 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:878
 #, 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:881
 #, 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:888
 #, 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:915
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4390,275 +4396,275 @@ msgstr ""
 "Teljesen biztos abban, hogy alá akarja írni ezt a kulcsot\n"
 "az Ön kulcsával: \""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, 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:928
 #, 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:935
 #, 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:945
 #, 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:952
 #, 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:959
 #, 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:964
 #, 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:969
 #, 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:981
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Valóban aláírja? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Aláírás sikertelen: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "mentés és kilépés"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Aláírás-jelölés: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "kilistázza a kulcs- és felhasználóazonosítókat"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "N. felhasználói azonosító kiválasztása"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 #, fuzzy
 msgid "select subkey N"
 msgstr "N. felhasználói azonosító kiválasztása"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 #, fuzzy
 msgid "check signatures"
 msgstr "aláírások visszavonása"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "kulcs helyi aláírása"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, 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:1289
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "add a user ID"
 msgstr "felhasználói azonosító hozzáadása"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "fotóazonosító hozzáadása"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "felhasználói azonosító törlése"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "másodlagos kulcs törlése"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "visszavonó kulcs hozzáadása"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 #, 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:1314
 #, 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:1316
 #, 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:1319
 msgid "list preferences (expert)"
 msgstr "preferenciák listázása (szakértő)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "preferenciák listázása (részletes)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 #, 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:1325
 #, 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:1327
 #, 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:1329
 msgid "change the passphrase"
 msgstr "jelszóváltoztatás"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "kulcstulajdonos megbízhatóságának beállítása"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 #, 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:1337
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "felhasználói azonosító visszavonása"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "másodlagos kulcs visszavonása"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 #, fuzzy
 msgid "enable key"
 msgstr "kulcs engedélyezése"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 #, fuzzy
 msgid "disable key"
 msgstr "kulcs tiltása"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "fotóazonosító megmutatása"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1349
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1470
 msgid "Secret key is available.\n"
 msgstr "Titkos kulcs rendelkezésre áll.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 #, 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:1574
 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:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4666,309 +4672,293 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "A kulcsot visszavonták."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 #, 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:1682
 #, 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:1690
 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:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 #, 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:1756
 #, 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:1814 g10/keyedit.c:1854
 #, 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 #, 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:1894
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, 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:1934
 #, 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:1969
 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:1975
 #, 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:1977
 #, 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:2015
 #, 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:2016
 #, 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:2034
 #, 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:2045
 #, 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:2047
 #, 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:2105
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2150
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "preferencialista beállítása"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 #, 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:2159
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Valóban frissítsem a preferenciákat? "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Mentsem a változtatásokat? "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kilépjek mentés nélkül? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, 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:2557
+#: g10/keyedit.c:2558
 #, 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:2583
+#: g10/keyedit.c:2584
 #, 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:2646
+#: g10/keyedit.c:2647
 #, 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:2677
+#: g10/keyedit.c:2717
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Érvénytelen érték!\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Nincs ilyen felhasználói azonosító.\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Nincs mit aláírni a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   aláírva %08lX által %s%s időpontban.\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, 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:3211
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Kivonat: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Jellemzők: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 #, fuzzy
 msgid "Notations: "
 msgstr "Jelölés: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (érzékeny)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 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:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lejár: %s]"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lejár: %s]"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4976,19 +4966,19 @@ msgstr ""
 "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:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4997,18 +4987,18 @@ msgstr ""
 "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:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5018,35 +5008,35 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verziói visszautasítják ezt a kulcsot.\n"
 
-#: g10/keyedit.c:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Továbbra is hozzá akarja adni? (i/N) "
 
-#: g10/keyedit.c:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Törli ezt a jó aláírást? (i/N/k)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Törli ezt az érvénytelen aláírást? (i/N/k)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Törli ezt az ismeretlen aláírást? (i/N/k)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Valóban törli ezt az önaláírást? (i/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5054,38 +5044,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Töröltem %d aláírást.\n"
 msgstr[1] "Töröltem %d aláírást.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Nem töröltem semmit.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 #, fuzzy
 msgid "invalid"
 msgstr "érvénytelen páncél"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "\"%s\" felhasználói azonosítót visszavonták."
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "\"%s\" felhasználói azonosítót visszavonták."
 msgstr[1] "\"%s\" felhasználói azonosítót visszavonták."
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, 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:4534
+#: g10/keyedit.c:4426
 #, 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:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5095,224 +5085,224 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verziók visszautasítják ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 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:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 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:4719
+#: g10/keyedit.c:4611
 #, 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:4788
+#: g10/keyedit.c:4680
 #, 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:4793
+#: g10/keyedit.c:4685
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Másodlagos kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Elsődleges kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Másodlagos kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 #, 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:5033
+#: g10/keyedit.c:4925
 #, 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:5039
+#: g10/keyedit.c:4931
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5156
+#: g10/keyedit.c:5048
 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:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, 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:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy használni akarja (i/N)? "
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy használni akarja (i/N)? "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Aláírás-jelölés: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Felülírjam (i/N)? "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhasználóazonosító: \""
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (nem exportálható)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az aláírás lejárt %s időpontban.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy mégis visszavonja? (i/N) "
 
-#: g10/keyedit.c:6078
+#: g10/keyedit.c:5972
 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:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem exportálható)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX által %s időpontban.\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "A következő aláírásokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Valóban létrehozzam a visszavonó igazolást? (i/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, 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:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, 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:6464
+#: g10/keyedit.c:6358
 #, 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:6526
+#: g10/keyedit.c:6420
 #, 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:6623
+#: g10/keyedit.c:6517
 #, 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"
@@ -5352,53 +5342,53 @@ msgstr "Túl sok \"%c\" preferencia.\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "Érvénytelen karakter a preferenciák között!\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "Sima aláírást írok.\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "Önaláírást írok.\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "Összefűző aláírást írok.\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Kulcsméret érvénytelen; %u bitet használok.\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Kulcsméretet felkerekítettem %u bitre.\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 #, fuzzy
 msgid "Encrypt"
 msgstr "adat titkosítása"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr ""
 
@@ -5412,180 +5402,180 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (csak titkosítás)\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA és ElGamal (alapértelmezés)\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, 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:2136
+#: g10/keygen.c:2113
 #, 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:2142
+#: g10/keygen.c:2119
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (csak titkosítás)\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, 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:2150
+#: g10/keygen.c:2127
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, 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:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (alapértelmezés)"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, 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:2161
+#: g10/keygen.c:2138
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, 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:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) RSA (csak titkosítás)\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Aláírás-jelölés: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 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:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 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:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "kulcs tiltása"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, 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:2570
+#: g10/keygen.c:2547
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2555
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Milyen kulcsméretet szeretne? (1024) "
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 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:2641
+#: g10/keygen.c:2618
 #, 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:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5601,7 +5591,7 @@ msgstr ""
 "      <n>m = a kulcs n hónapig érvényes\n"
 "      <n>y = a kulcs n évig érvényes\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5617,40 +5607,40 @@ msgstr ""
 "      <n>m = az aláírás n hónapig érvényes\n"
 "      <n>y = az aláírás n évig érvényes\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Meddig érvényes a kulcs? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Meddig érvényes az aláírás? (0) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "Érvénytelen érték!\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s soha nem jár le.\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s soha nem jár le.\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s lejár: %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Az aláírás lejár: %s.\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5658,12 +5648,12 @@ msgstr ""
 "Az Ön rendszere nem tud megjeleníteni 2038 utáni dátumokat.\n"
 "Azonban kezelni helyesen tudja őket egészen 2106-ig.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ez így helyes (i/n)? "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5674,7 +5664,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 #, fuzzy
 msgid ""
 "\n"
@@ -5691,42 +5681,42 @@ msgstr ""
 "    \"Heinrich Heine (a költő) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Teljes név: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Érvénytelen karakter a névben!\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "E-mail cím: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Ez nem érvényes e-mail cím.\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Megjegyzés: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Érvénytelen karakter a megjegyzésben!\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, 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:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5737,11 +5727,11 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5756,32 +5746,32 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnMmEeRrKk"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 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:3148
+#: g10/keygen.c:3125
 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Kérem, előbb javítsa ki a hibát!\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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 +5783,18 @@ msgstr ""
 "a lemezeket) a prímszám generálása alatt. Ez segíti a véletlenszám-\n"
 "generátort, hogy entrópiát tudjon gyűjteni.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgenerálás sikertelen: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5812,69 +5802,69 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "\"%s\" már tömörített.\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Mégis létrehozzam? "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Mégis létrehozzam? "
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Kulcs létrehozása megszakítva.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, 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:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, 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:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem írható nyilvánoskulcs-karikát találtam: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, 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:5644
+#: g10/keygen.c:5615
 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:5660
+#: g10/keygen.c:5631
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5884,38 +5874,38 @@ msgstr ""
 "kíván ilyen célra létrehozni, azt az \"--edit-key\" parancs segítségével\n"
 "teheti meg.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, 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:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, 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:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Valóban létrehozzam? "
@@ -5924,27 +5914,43 @@ msgstr "Valóban létrehozzam? "
 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 +5958,7 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d rossz aláírás.\n"
 msgstr[1] "%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 +5966,41 @@ msgid_plural "%d signatures not checked due to errors\n"
 msgstr[0] "1 aláírást nem ellenőriztem hiba miatt.\n"
 msgstr[1] "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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Kulcskarika"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Elsődlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr "Elsődlegeskulcs-ujjlenyomat:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "         Alkulcsujjlenyomat:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr " Kulcs ujjlenyomata ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -6375,7 +6381,7 @@ msgstr "Bináris"
 msgid "textmode"
 msgstr "Szövegmódú"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "Ismeretlen módú"
 
@@ -6518,27 +6524,27 @@ msgstr "tömörítetlen"
 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:1614
 #, 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:1639
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "ismeretlen aláírásosztály"
@@ -6662,7 +6668,7 @@ msgid ""
 "%s"
 msgstr "%u bites %s kulcs, azonosító: %08lX, létrehozva: %s."
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6676,74 +6682,74 @@ msgstr ""
 "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:207
 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:228
 #, 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:239
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:241
 #, 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:257
 #, 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:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Ez a fotó megfelelő (i/N/k)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, 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:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, 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:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6751,7 +6757,7 @@ msgstr ""
 "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:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "Nem tudom megjeleníteni a fotóazonosítót!\n"
@@ -7081,12 +7087,12 @@ msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 msgid "no valid addressees\n"
 msgstr "Nincsenek érvényes címzettek!\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, 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:1768
+#: g10/pkclist.c:1766
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "%08lX kulcs: Nincs felhasználói azonosító.\n"
@@ -8141,7 +8147,7 @@ msgstr ""
 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"
@@ -8171,14 +8177,14 @@ msgstr "Kérem, hajtson végre egy --check-trustdb parancsot!\n"
 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"
 msgstr[0] "Eddig %lu kulcsot dolgoztam fel.\n"
 msgstr[1] "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"
@@ -8186,23 +8192,23 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d kulcsot feldolgoztam (%d érvényességszámlálót töröltem)\n"
 msgstr[1] "%d kulcsot feldolgoztam (%d érvényességszámlálót töröltem)\n"
 
-#: g10/trustdb.c: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"
@@ -8331,7 +8337,7 @@ msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8339,7 +8345,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8375,7 +8381,7 @@ msgstr "jelszóváltoztatás"
 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:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8461,75 +8467,75 @@ msgstr[1] "Kulcsgenerálás sikertelen: %s\n"
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "jelszóváltoztatás"
 
-#: scd/app-nks.c:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1654
+#: 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:1701
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2074
+#: 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:2082
+#: 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:2092
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2102
+#: 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:2104
+#: 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:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
@@ -8794,13 +8800,13 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8809,11 +8815,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:199 sm/certchain.c:2211
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -8837,241 +8843,241 @@ msgstr ""
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, 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:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:818
 #, 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:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, 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:1260 sm/certchain.c:1264
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "MEGJEGYZÉS: A kulcsot visszavonták."
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 #, 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:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Ez a kulcs lejárt!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Ez a kulcs lejárt!"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Ez a kulcs lejárt!"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1404
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Ez a kulcs lejárt!"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "              új aláírások: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "rossz igazolás"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1505
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1511
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "visszavonási igazolás készítése"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, 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:1911 dirmngr/validate.c:693
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "%c%lu preferencia kétszer szerepel!\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "rossz igazolás"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9094,7 +9100,7 @@ msgstr "nem feldolgozott"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "nem"
@@ -9131,42 +9137,42 @@ msgstr ""
 "\"%.*s\"\n"
 "%u bites %s key, azonosító: %08lX, létrehozva: %s%s\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "rossz igazolás"
@@ -9725,7 +9731,7 @@ msgstr ""
 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:916
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Aláírva: %.*s; kulcs: %s, %08lX.\n"
@@ -9919,7 +9925,7 @@ msgstr "A kulcsblokk törlése sikertelen: %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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@ -10169,201 +10175,201 @@ msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1849 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:1923
 #, 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:1938
 #, 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:1945
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, 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:1984
 #, 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:2011
 #, 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:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, 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:2084
 #, 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:2226
 #, 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:2233
 #, 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:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, 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:2301
 #, 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:2308
 #, 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:2333
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2414
 #, 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:2446
 #, 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:2460
 #, 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:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 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:2523
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, 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:2558
 #, 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:2569
 #, 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:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, 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:2779
+#: dirmngr/crlcache.c:2780
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
@@ -10725,12 +10731,12 @@ msgstr "Használat: gpg [opciók] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s és %s nem használható együtt!\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
@@ -10978,93 +10984,93 @@ msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:582
+#: 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:598 dirmngr/ocsp.c:782
+#: 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:642
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:698
+#: 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:708
+#: 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:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:753
+#: 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:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:765
+#: 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:822
+#: 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:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11078,64 +11084,64 @@ msgstr "Aláírás sikertelen: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "Aláírás sikertelen: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, 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:1743
 #, 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:1776
 #, 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:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, 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:3033
+#: dirmngr/server.c:3049
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, 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:3062
+#: dirmngr/server.c:3078
 #, 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:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11454,87 +11460,102 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Visszavonó igazolás létrehozva.\n"
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: 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:3706
+#: 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:3707
+#: 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:3708
+#: 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:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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"
 
@@ -13157,9 +13178,6 @@ msgstr ""
 #~ 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"
 
diff --git a/po/id.gmo b/po/id.gmo
index f552f13..13743ac 100644
--- a/po/id.gmo
+++ b/po/id.gmo
diff --git a/po/id.po b/po/id.po
index 751bb37..1e68939 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -145,8 +145,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "passphrase yang buruk"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
@@ -200,25 +200,25 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "ubah passphrase"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, 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:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -229,26 +229,26 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -259,39 +259,39 @@ msgstr "tidak dapat membuka `%s': %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, 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:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, 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:3797
+#: agent/command-ssh.c:3837
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
@@ -422,208 +422,214 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "ubah passphrase"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "detil"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "perbarui database trust"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 #, 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:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "tidak didukung"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "tidak didukung"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "tidak didukung"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|gunakan passphrase mode N"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "gunakan gpg-agent"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
@@ -631,149 +637,149 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Laporkan bug ke <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:570
+#: agent/gpg-agent.c:582
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, 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:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, 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:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, 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:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2853
+#: agent/gpg-agent.c:2967
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: dilewati: %s\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1035,7 +1041,7 @@ msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 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:1602
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1053,52 +1059,52 @@ msgstr "algoritma proteksi %d%s tidak didukung\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1129,18 +1135,18 @@ msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "y|ya"
 
@@ -1195,8 +1201,8 @@ msgstr ""
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1216,69 +1222,69 @@ msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 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:432 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"
@@ -1446,12 +1452,12 @@ msgstr "Kunci ini telah berakhir!"
 msgid "Root certificate trustworthy"
 msgstr "sertifikat yang buruk"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "sertifikat yang buruk"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kunci tersedia di:"
@@ -1493,7 +1499,7 @@ msgstr "Tidak tersedia bantuan untuk `%s'"
 msgid "ignoring garbage line"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 #, fuzzy
 msgid "[none]"
 msgstr "tidak dikenal"
@@ -1538,36 +1544,36 @@ msgstr "tidak dapat membuka file: %s\n"
 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
 #, 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"
@@ -1577,92 +1583,92 @@ msgstr "menulis kunci rahasia ke `%s'\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: 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"
@@ -1670,13 +1676,13 @@ msgstr ""
 "karakter yang dapat dicetak dalam armor - mungkin telah digunakan MTA yang "
 "mengandung bug\n"
 
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "tidak dapat dibaca manusia"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1685,27 +1691,27 @@ msgstr ""
 "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
 "dan diakhiri dengan sebuah '='\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, 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:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1715,7 +1721,7 @@ msgstr ""
 "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
 "dan diakhiri dengan sebuah '='\n"
 
-#: g10/build-packet.c:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
@@ -1729,7 +1735,7 @@ msgstr ""
 msgid "Enter passphrase: "
 msgstr "Masukkan passphrase: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 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"
@@ -1747,7 +1753,7 @@ msgstr "kesalahan membaca `%s': %s\n"
 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:2330
+#: 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"
@@ -1790,177 +1796,177 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1500
+#: g10/card-util.c:803 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1502
+#: g10/card-util.c:805 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "perbarui preferensi"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 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:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -1968,102 +1974,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 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:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2071,197 +2077,197 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 #, 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:1743 g10/card-util.c:1833
 #, 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:1744 g10/card-util.c:1835
 #, 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:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 #, 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:1876
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 #, fuzzy
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 tools/gpg-card.c:3743
 #, fuzzy
 msgid "list all available data"
 msgstr "Kunci tersedia di:"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3689
+#: g10/card-util.c:2262 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 #, fuzzy
 msgid "change the login name"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 #, fuzzy
 msgid "generate new keys"
 msgstr "buat sepasang kunci baru"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3698
+#: g10/card-util.c:2271 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 #, 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:2276
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 #, 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2323,9 +2329,9 @@ msgstr "kunci"
 msgid "subkey"
 msgstr "Pubkey: "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
@@ -2356,19 +2362,19 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2379,61 +2385,62 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/encrypt.c:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "menggunakan cipher %s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, 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:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, 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:862
+#: g10/encrypt.c:853
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "Membaca dari `%s'\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, 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:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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"
@@ -2462,69 +2469,80 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2593,7 +2611,7 @@ msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opsi impor tidak valid\n"
@@ -2677,120 +2695,120 @@ msgstr "buat sepasang kunci baru"
 msgid "quickly set a new expiration date"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "ubah passphrase"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "ekspor kunci ke keyserver"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "impor kunci dari keyserver"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "cari kunci di keyserver"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
@@ -2806,56 +2824,56 @@ msgstr "jangan buat perubahan"
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "impor kunci dari keyserver"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2883,7 +2901,7 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2891,7 +2909,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2921,13 +2939,13 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 #, 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:1175
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2942,7 +2960,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2950,574 +2968,562 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1698
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1716
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, 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:1735
+#: g10/gpg.c:1725
 #, 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:1738
+#: g10/gpg.c:1728
 #, 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:1744
+#: g10/gpg.c:1734
 #, 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:1747
+#: g10/gpg.c:1737
 #, 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:1750
+#: g10/gpg.c:1740
 #, 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:1966
+#: g10/gpg.c:1956
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "set daftar preferensi"
+
+#: g10/gpg.c:2197
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, 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:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3952
-#, 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:3964
+#: g10/gpg.c:3927
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:4015
-#, 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:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, 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:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, 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:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, 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:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/gpg.c:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -3531,7 +3537,7 @@ msgstr "mengambil kunci ini dari keyring"
 msgid "make timestamp conflicts only a warning"
 msgstr "buat timestamp konflik hanya sebagai peringatan"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 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,335 +3568,335 @@ msgstr "Tidak tersedia bantuan"
 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:1998 g10/import.c:3146
 #, 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:2004
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, 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:2801
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
@@ -3903,201 +3909,201 @@ msgstr "kesalahan mengirim ke `%s': %s\n"
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, 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:3138 g10/import.c:3177
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "Alasan pembatalan:"
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "Komentar pembatalan:"
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, 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:3788
 #, 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:3812
 #, 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:3825
 #, 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:3840
 #, 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:3887
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:3841
+#: g10/import.c:3914
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
@@ -4135,7 +4141,7 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "User ID \"%s\" dibatalkan."
 msgstr[1] "User ID \"%s\" dibatalkan."
 
-#: g10/key-check.c:726 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 +4149,7 @@ msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr[0] "1 signature tidak diperiksa karena tidak ada kunci\n"
 msgstr[1] "1 signature tidak diperiksa karena tidak ada kunci\n"
 
-#: g10/key-check.c:734 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"
@@ -4197,15 +4203,15 @@ msgstr "kesalahan penciptaan : `%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[revocation]"
 msgstr "[pembatalan]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[self-signature]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4218,68 +4224,68 @@ msgstr ""
 "memeriksa fingerprint dari berbagai sumber...)?\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 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:390 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:408
 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:425
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "..Tidak dapat menandai.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "User ID \"%s\" kadaluwarsa."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:646
 #, fuzzy, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "User ID \"%s\" bukan self-signed."
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4288,11 +4294,11 @@ msgstr ""
 "Self-signature pada \"%s\"\n"
 "adalah signature bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4301,13 +4307,13 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "telah habis berlaku.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4316,43 +4322,43 @@ msgstr ""
 "Signature anda saat ini pada \"%s\"\n"
 "adalah signature.lokal \n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "Kunci ini telah berakhir!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4362,32 +4368,32 @@ msgstr ""
 "menandai benar benar milik\n"
 "orang tersebut?  Jika anda tidak tahu jawabannya. masukkan \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, 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:876
 #, 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:878
 #, 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:881
 #, 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:888
 #, fuzzy
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Pilihan Anda? (berikan '?' untuk informasi lebih lanjut):"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4396,275 +4402,275 @@ msgstr ""
 "Apakah anda yakin untuk menandai kunci ini \n"
 "dengan kunci anda: "
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Ini akan jadi self-signature.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, 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:935
 #, 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:945
 #, 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:952
 #, 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:959
 #, 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:964
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Saya telah memeriksa kunci ini.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, 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:981
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Notasi signature: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 #, fuzzy
 msgid "select subkey N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 #, fuzzy
 msgid "check signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, 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:1289
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "hapus ID user"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "tambah kunci pembatalan"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1314
 #, 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:1316
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1325
 #, 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:1327
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1329
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "batalkan sebuah ID user"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 #, fuzzy
 msgid "enable key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 #, fuzzy
 msgid "disable key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "tampilkan photo ID"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1349
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1470
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 #, 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:1574
 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:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4672,309 +4678,293 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 #, fuzzy
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1682
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1690
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 #, 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:1814 g10/keyedit.c:1854
 #, 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, fuzzy, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, 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:1969
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1975
 #, 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:1977
 #, 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:2015
 #, 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:2016
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Benar-benar hapus ID user ini? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2034
 #, 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:2045
 #, 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:2047
 #, 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:2105
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2150
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 #, 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:2159
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:2557
+#: g10/keyedit.c:2558
 #, 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:2583
+#: g10/keyedit.c:2584
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/keyedit.c:2677
+#: g10/keyedit.c:2717
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   ditandai oleh %08lX pada %s%s\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, 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:3211
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Digest: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Fitur: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 #, fuzzy
 msgid "Notations: "
 msgstr "Notasi: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3765
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4982,19 +4972,19 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5003,18 +4993,18 @@ msgstr ""
 "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:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5024,35 +5014,35 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5060,38 +5050,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Menghapus %d signature.\n"
 msgstr[1] "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "User ID \"%s\" dibatalkan."
 msgstr[1] "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5101,46 +5091,46 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 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:4719
+#: g10/keyedit.c:4611
 #, 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:4788
+#: g10/keyedit.c:4680
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5148,181 +5138,181 @@ msgid ""
 msgstr ""
 "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 #, 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:5033
+#: g10/keyedit.c:4925
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/keyedit.c:5039
+#: g10/keyedit.c:4931
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, 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:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notasi signature: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, 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:6464
+#: g10/keyedit.c:6358
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, 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"
@@ -5362,53 +5352,53 @@ msgstr "terlalu banyak preferensi `%c'\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "menulis signature direct\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "menulis self signature\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 #, fuzzy
 msgid "Sign"
 msgstr "tandai"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 #, fuzzy
 msgid "Encrypt"
 msgstr "enkripsi data"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr ""
 
@@ -5422,180 +5412,180 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, 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:2136
+#: g10/keygen.c:2113
 #, 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:2142
+#: g10/keygen.c:2119
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "  (%d) ElGamal (hanya enkripsi)\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, 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:2150
+#: g10/keygen.c:2127
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, 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:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (default)"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, 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:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notasi signature: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 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:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 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:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "tiadakan kunci"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, 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:2570
+#: g10/keygen.c:2547
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2555
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 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:2641
+#: g10/keygen.c:2618
 #, 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:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5611,7 +5601,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5627,40 +5617,40 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5668,12 +5658,12 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5684,7 +5674,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 #, fuzzy
 msgid ""
 "\n"
@@ -5700,42 +5690,42 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, 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:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5745,11 +5735,11 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5764,35 +5754,35 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 #, 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:3148
+#: g10/keygen.c:3125
 #, 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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 +5794,18 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5823,69 +5813,69 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Tetap dibuat? "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Tetap dibuat? "
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, 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:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, 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:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5895,37 +5885,37 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, 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:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, 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:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keygen.c:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
@@ -5934,27 +5924,43 @@ msgstr "Ingin diciptakan? "
 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 +5968,7 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d signature yang buruk\n"
 msgstr[1] "%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 +5976,41 @@ msgid_plural "%d signatures not checked due to errors\n"
 msgstr[0] "1 signature tidak diperiksa karena kesalahan\n"
 msgstr[1] "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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Keyring"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Fingerprint kunci primer:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr "     Fingerprint kunci primer ="
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "     Fingerprint subkunci ="
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "     Fingerprint kunci ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -6381,7 +6387,7 @@ msgstr "biner"
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "tidak dikenal"
 
@@ -6521,27 +6527,27 @@ msgstr "Tidak dikompresi"
 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:1614
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "kelas signature tidak dikenal"
@@ -6662,7 +6668,7 @@ msgid ""
 "%s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6678,73 +6684,73 @@ msgstr ""
 "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:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Masukkan nama file JPEG sebagai ID foto: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, 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:239
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:241
 #, 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:257
 #, 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:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Apakah foto ini benar (y/N/q)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, 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:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "program eksternal berhenti secara tidak natual\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6752,7 +6758,7 @@ msgstr ""
 "pemanggilan program eksternal ditiadakan karena permisi opsi file tidak "
 "aman\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "tidak dapat menampilkan photo ID!\n"
@@ -7082,12 +7088,12 @@ msgstr "penerima baku tidak dikenal `%s'\n"
 msgid "no valid addressees\n"
 msgstr "tidak ada alamat yang valid\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
@@ -8140,7 +8146,7 @@ msgstr ""
 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"
@@ -8170,14 +8176,14 @@ msgstr "lakukanlah --check-trustdb\n"
 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"
 msgstr[0] "%lu kunci telah diproses\n"
 msgstr[1] "%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"
@@ -8185,23 +8191,23 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d kunci diproses (%d hitungan validitas dihapus)\n"
 msgstr[1] "%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"
@@ -8330,7 +8336,7 @@ msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8338,7 +8344,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8374,7 +8380,7 @@ msgstr "ubah passphrase"
 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:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8460,75 +8466,75 @@ msgstr[1] "Pembuatan kunci gagal: %s\n"
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "ubah passphrase"
 
-#: scd/app-nks.c:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1654
+#: 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:1701
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2074
+#: scd/app-nks.c:2088
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "ubah passphrase"
 
-#: scd/app-nks.c:2082
+#: 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:2092
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2102
+#: 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:2104
+#: 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:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -8793,13 +8799,13 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8808,11 +8814,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:199 sm/certchain.c:2211
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 #, fuzzy
 msgid "shell"
 msgstr "bantuan"
@@ -8836,241 +8842,241 @@ msgstr ""
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, fuzzy, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:818
 #, fuzzy, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, fuzzy, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1260 sm/certchain.c:1264
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "CATATAN: kunci telah dibatalkan"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 #, 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:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1404
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Kunci ini telah berakhir!"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "       signature baru: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "sertifikat yang buruk"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "tampilkan fingerprint"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1505
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1511
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "buat sertifikat revokasi"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verifikasi signature"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1911 dirmngr/validate.c:693
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "preferensi %c%lu ganda \n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "sertifikat yang buruk"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9093,7 +9099,7 @@ msgstr "tidak diproses"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "n|t|tidak"
@@ -9129,42 +9135,42 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "sertifikat yang buruk"
@@ -9724,7 +9730,7 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Signature membuat %.*s menggunakan kunci %s ID %08lX\n"
@@ -9918,7 +9924,7 @@ msgstr "gagal menghapus keyblok: %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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -10168,201 +10174,201 @@ msgstr "algoritma hash tidak valid `%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1849 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:1923
 #, 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:1938
 #, 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:1945
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, fuzzy, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1984
 #, 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:2011
 #, fuzzy, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "buat sertifikat revokasi"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, 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:2084
 #, 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:2226
 #, fuzzy, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2233
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, 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:2301
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "menulis ke `%s'\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2308
 #, 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:2333
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2414
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, fuzzy, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2460
 #, 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:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 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:2523
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, 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:2558
 #, 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:2569
 #, fuzzy, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "rev? masalah memeriksa pembatalan: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
@@ -10724,12 +10730,12 @@ msgstr "pemakaian: gpg [pilihan] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
@@ -10977,93 +10983,93 @@ msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:582
+#: dirmngr/ocsp.c:585
 #, fuzzy, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/ocsp.c:598 dirmngr/ocsp.c:782
+#: 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:642
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:698
+#: dirmngr/ocsp.c:710
 #, fuzzy, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "buat sertifikat revokasi"
 
-#: dirmngr/ocsp.c:708
+#: dirmngr/ocsp.c:720
 #, fuzzy, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: dirmngr/ocsp.c:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:753
+#: 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:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:765
+#: 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:822
+#: 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:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11077,64 +11083,64 @@ msgstr "gagal menandai: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, fuzzy, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1776
 #, fuzzy, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, 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:3062
+#: dirmngr/server.c:3078
 #, fuzzy, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: dirmngr/server.c:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11453,87 +11459,102 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: 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:3706
+#: 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:3707
+#: tools/gpg-card.c:3765
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: tools/gpg-card.c:3708
+#: tools/gpg-card.c:3766
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Sertifikat pembatalan tercipta.\n"
 
-#: tools/gpg-card.c:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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"
 
@@ -13160,9 +13181,6 @@ msgstr ""
 #~ msgid "delete signatures"
 #~ msgstr "hapus signature"
 
-#~ msgid "set preference list"
-#~ msgstr "set daftar preferensi"
-
 #~ msgid "updated preferences"
 #~ msgstr "perbarui preferensi"
 
diff --git a/po/it.gmo b/po/it.gmo
index 7eb6590..789e14a 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index 22866b1..0fec03e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.3.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2021-04-15 10:09+0900\n"
 "Last-Translator: Denis <student@alice.it>\n"
 "Language-Team: \n"
@@ -141,8 +141,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "non corrisponde - riprova"
 
@@ -191,17 +191,17 @@ msgstr "Nota: richiesta dal browser Web."
 msgid "Note: Request from a remote site."
 msgstr "Nota: richiesta da un sito remoto."
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, 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:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Inserisci di nuovo questa passphrase"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -210,7 +210,7 @@ msgstr ""
 "Immettere la passphrase per proteggere l'oggetto importato all'interno %s "
 "sistema."
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -223,25 +223,25 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "impossibile aprire '%s': %s\n"
@@ -251,12 +251,12 @@ msgstr "impossibile aprire '%s': %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "nessuna chiave della scheda adatta trovata: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, 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:2777
+#: agent/command-ssh.c:2782
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -265,20 +265,20 @@ msgstr ""
 "Un processo ssh ha richiesto l'utilizzo della chiave%%0A  %s%%0A  (%s)%%0ASi "
 "desidera consentire questa operazione?"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Permettere"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Rifiutare"
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -287,7 +287,7 @@ msgstr ""
 "Immettere una passphrase per proteggere la chiave segreta ricevuta%%0A %s"
 "%%0A %s%%0A all'interno dell'archivio chiavi dell'agente gpg"
 
-#: agent/command-ssh.c:3797
+#: agent/command-ssh.c:3837
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "impossibile creare il flusso dal socket: %s\n"
@@ -415,206 +415,212 @@ msgstr "Immettere la passphrase a%0Aproteggere la nuova chiave"
 msgid "Please enter the new passphrase"
 msgstr "Inserisci la nuova passphrase"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr "Opzioni utilizzate per l'avvio"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr "eseguire in modalità daemon (sfondo)"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr "eseguire in modalità server (in primo piano)"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "non scollegarsi dalla console"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr "uscita del comando sh-stile"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr "uscita del comando in csh-stile"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|opzioni di lettura da FILE"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr "Opzioni che controllano l'output diagnostico"
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "prolisso"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|scrittura dei registri in modalità server in FILE"
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr "Opzioni che controllano la configurazione"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 msgid "do not use the SCdaemon"
 msgstr "non utilizzare il SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "| PGM| utilizzare PGM come programma SCdaemon"
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|utilizzare PGM come programma tpm2daemon"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|accettare alcuni comandi tramite NAME"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr "ignorare le richieste di modifica del TTY"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr "ignorare le richieste di modifica della visualizzazione X"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 msgid "enable ssh support"
 msgstr "abilitare il supporto ssh"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|usa ALGO per mostrare le impronte digitali ssh"
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 msgid "enable putty support"
 msgstr "abilitare il supporto putty"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "abilitare il supporto putty"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "Opzioni che controllano la sicurezza"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|scadenza PIN memorizzati nella cache dopo N secondi"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|Chiavi SSH di N-scadenza dopo N secondi"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 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:248
+#: agent/gpg-agent.c:256
 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:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr "non utilizzare la cache PIN durante la firma"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 msgid "disallow the use of an external password cache"
 msgstr "non consentire l'uso di una cache di password esterna"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 "non consentire ai client di contrassegnare le chiavi come \"attendibili\""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 msgid "allow presetting passphrase"
 msgstr "consentire la preimpostazione della passphrase"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr "Opzioni che applicano un criterio di passphrase"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr "non consentire l'esclusione dei criteri di passphrase"
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 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:271
+#: agent/gpg-agent.c:279
 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:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE||controlla le nuove passphrase rispetto al modello in FILE"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 msgid "|N|expire the passphrase after N days"
 msgstr "| La passphrase dopo N giorni"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 msgid "do not allow the reuse of old passphrases"
 msgstr "non consentono il riutilizzo di vecchie passphrase"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr "Opzioni che controllano la voce PIN"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 msgid "never use the PIN-entry"
 msgstr "non utilizzare mai la voce PIN-Entry"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr "non consentire al chiamante di eseguire l'override del pinentry"
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "lasciare che PIN-Entry prenda la tastiera e mouse"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "| PGM|utilizzare PGM come programma PIN-Entry"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|Il timeout di Pinentry è impostato su N secondi"
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: 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:570
+#: agent/gpg-agent.c:582
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Utilizzo: @GPG_AGENT@ [opzioni] (-h per assistenza)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -622,135 +628,135 @@ msgstr ""
 "Sintassi: @GPG_AGENT@ [opzioni] [comando [args]]\n"
 "Gestione delle chiavi segrete per @GNUPG@\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "'%s' a livello di debug non valido specificato\n"
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "opzioni di lettura da '%s'\n"
 
-#: agent/gpg-agent.c:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossibile creare il socket: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "il nome socket '%s' è troppo lungo\n"
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, 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:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, 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:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "impossibile impostare le autorizzazioni di '%s': %s\n"
 
-#: agent/gpg-agent.c:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "ascolto sul socket '%s'\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "impossibile creare la directory '%s': %s\n"
 
-#: agent/gpg-agent.c:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "directory '%s' creata\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() non riuscito per '%s': %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "impossibile utilizzare '%s' come home directory\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, 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:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "gestore 0x%lx per fd %d avviato\n"
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "gestore 0x%lx per fd %d terminato\n"
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, 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:2853
+#: agent/gpg-agent.c:2967
 #, 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:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect non riuscito: %s - 1s in attesa\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s arrestato\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1028,7 +1034,7 @@ msgstr "controllo della firma creata fallito: %s\n"
 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:1602
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "l'algoritmo a chiave pubblica %d (%s) non è supportato\n"
@@ -1043,52 +1049,52 @@ msgstr "algoritmo di protezione %d (%s) non supportato\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1118,18 +1124,18 @@ msgstr "Avviso: proprietà non sicura su %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Avviso: autorizzazioni non sicure su %s \"%s\"\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "in attesa che il file '%s' diventi accessibile …\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "sì"
 
@@ -1184,8 +1190,8 @@ msgstr ""
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1205,69 +1211,69 @@ msgstr "AVVISO: \"%s%s\" è un'opzione obsoleta - non ha alcun effetto\n"
 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:432 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"
@@ -1415,11 +1421,11 @@ msgstr "Catena di certificati valida"
 msgid "Root certificate trustworthy"
 msgstr "Certificato radice attendibile"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 msgid "no CRL found for certificate"
 msgstr "nessun CRL trovato per il certificato"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 msgid "the available CRL is too old"
 msgstr "il CRL disponibile è troppo vecchio"
 
@@ -1456,7 +1462,7 @@ msgstr "Nessuna Guida disponibile per '%s'."
 msgid "ignoring garbage line"
 msgstr "ignorando la linea spazzatura"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "[none]"
 msgstr "[nessuno]"
 
@@ -1502,36 +1508,36 @@ msgstr "iconv_open non riuscito: %s\n"
 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
 #, 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"
@@ -1541,92 +1547,92 @@ msgstr "attesa del blocco %s...\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s è troppo vecchio (è necessario %s, con %s)\n"
 
-#: g10/armor.c:441
+#: 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"
@@ -1634,12 +1640,12 @@ msgstr ""
 "carattere quoted printable nell'armatura - probabilmente è stato usato\n"
 "un MTA buggato\n"
 
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, c-format
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "[ non leggibile (%zu byte: %s%s) ]"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1648,33 +1654,33 @@ msgstr ""
 "il nome di una nota deve essere formato solo da caratteri stampabili o\n"
 "spazi e terminare con un '='\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, 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:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, 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:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
@@ -1688,7 +1694,7 @@ msgstr "impossibile proxy %s richiesta al client\n"
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 g10/sign.c:473
 #: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
@@ -1705,7 +1711,7 @@ msgstr "errore da TPM: %s\n"
 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:2330
+#: 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"
@@ -1745,170 +1751,170 @@ msgstr "il reindirizzamento HTTP dal server è stato pulito"
 msgid "server uses an invalid certificate"
 msgstr "server utilizza un certificato non valido"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "Sig."
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "Sig.ra."
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "costretto"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 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:1500
+#: g10/card-util.c:803 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:1502
+#: g10/card-util.c:805 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:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Cognome del titolare della carta: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 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:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 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:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Dati DO privati: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Preferenze lingua: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 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:1800
+#: g10/card-util.c:1199 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:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "Impronta digitale CA: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 msgid "not an OpenPGP card"
 msgstr "non una scheda OpenPGP"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr "Sostituire la chiave esistente? (y/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -1921,104 +1927,104 @@ msgstr ""
 "      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:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr "Modifica dell'attributo chiave della scheda per: "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 msgid "Signature key\n"
 msgstr "Chiave di firma\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 msgid "Encryption key\n"
 msgstr "Chiave di crittografia\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr "Chiave di autenticazione\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 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:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2029,177 +2035,177 @@ msgstr ""
 "   PIN : '%s'     PIN di amministrazione = '%s'\n"
 "È necessario modificarli utilizzando il comando --change-pin\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 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:1743 g10/card-util.c:1833
 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:1744 g10/card-util.c:1835
 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:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Chiave di autenticazione\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 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:1876
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD non riuscito: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 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:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "abbandona questo menù"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr "mostra comandi di amministrazione"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 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:3687
+#: g10/card-util.c:2260 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:3688
+#: g10/card-util.c:2261 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:3689
+#: g10/card-util.c:2262 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:3690
+#: g10/card-util.c:2263 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:3691
+#: g10/card-util.c:2264 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:3692
+#: g10/card-util.c:2265 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:3694
+#: g10/card-util.c:2267 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:3695
+#: g10/card-util.c:2268 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:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "genera nuove chiavi"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 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:3698
+#: g10/card-util.c:2271 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:3699
+#: g10/card-util.c:2272 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:3703
+#: g10/card-util.c:2273 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:2275
 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:2276
 msgid "change the key attribute"
 msgstr "modificare l'attributo chiave"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 msgid "Admin-only command\n"
 msgstr "Comando solo amministratore\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr "I comandi di amministrazione sono consentiti\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2262,9 +2268,9 @@ msgstr "key"
 msgid "subkey"
 msgstr "sottochiave"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
@@ -2297,19 +2303,19 @@ msgstr ""
 "AVVISO: l'imposizione della crittografia simmetrica %s (%d) viola le "
 "preferenze del destinatario\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr "(utilizzare l'opzione \"%s\" per ignorare)\n"
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2320,44 +2326,45 @@ msgstr ""
 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:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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 ""
 "impossibile usare un pacchetto ESK simmetrico a causa della modalità S2K\n"
 
-#: g10/encrypt.c:512
+#: g10/encrypt.c:503
 #, c-format
 msgid "using cipher %s.%s\n"
 msgstr "utilizzando il cifrario %s.%s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s' già compresso\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "AVVISO: '%s' è un file vuoto\n"
 
-#: g10/encrypt.c:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, 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:862
+#: g10/encrypt.c:853
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "lettura da '%s'\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2366,12 +2373,12 @@ msgstr ""
 "AVVISO: l'algoritmo di compressione %s (%d) viola le preferenze dei "
 "destinatari\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, c-format
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s.%s è crittografato per: \"%s\"\n"
 
-#: g10/encrypt.c:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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"
@@ -2400,61 +2407,73 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non è stato esportato nulla\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2519,7 +2538,7 @@ msgstr "Chiave non valida %s resa valida da --allow-non-selfsigned-uid\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "utilizzando la sottochiave %s anziché la chiave primaria %s\n"
 
-#: g10/getkey.c:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "valori validi per l'opzione '%s':\n"
@@ -2592,111 +2611,111 @@ msgstr "revocare rapidamente un id utente"
 msgid "quickly set a new expiration date"
 msgstr "impostare rapidamente una nuova data di scadenza"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr "generazione completa della coppia di chiavi in primo piano"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "quickly sign a key"
 msgstr "firmare rapidamente un tasto"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 msgid "quickly sign a key locally"
 msgstr "firmare rapidamente una chiave localmente"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "quickly revoke a key signature"
 msgstr "revocare rapidamente una firma chiave"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "esporta le chiavi a un keyserver"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "importa le chiavi da un keyserver"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "cerca delle chiavi su un keyserver"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un keyserver"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr "stampare lo stato della scheda"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr "modificare i dati su una scheda"
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr "modificare il PIN di una carta"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 msgid "print message digests"
 msgstr "stampare digest dei messaggi"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "eseguire in modalità server"
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALORE|impostare il criterio TOFU per una chiave"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|usa NAME come chiave segreta predefinita"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "Anche nome-crittografare all'ID utente NOME"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|configurare gli alias di posta elettronica"
 
@@ -2712,53 +2731,53 @@ msgstr "non fa cambiamenti"
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr "Opzioni che controllano l'input"
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr "Opzioni che controllano l'output"
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|scrittura dell'output in FILE"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|Impostare il livello di compressione su N (0 disabilita)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr "Opzioni che controllano l'importazione e l'esportazione delle chiavi"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 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:776
+#: g10/gpg.c:775
 msgid "import missing key from a signature"
 msgstr "importare la chiave mancante da una firma"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 msgid "include the public key in signatures"
 msgstr "includere la chiave pubblica nelle firme"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "disabilitare tutti gli accessi al dirmngr"
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr "Opzioni di controllo delle inserzioni chiave"
 
@@ -2782,7 +2801,7 @@ msgstr "Opzioni per l'uso automatico"
 msgid "Other options"
 msgstr "Altre Opzioni"
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2790,7 +2809,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2810,11 +2829,11 @@ msgstr ""
 " --list-keys [nomi]       mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Utilizzo: @GPG@ [opzioni] [file] (-h per assistenza)"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1172
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2824,7 +2843,7 @@ msgstr ""
 "Firmare, controllare, crittografare o decrittografare\n"
 "Il funzionamento predefinito dipende dai dati di input\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2832,73 +2851,73 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "utilizzo: %s [opzioni] %s\n"
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "nessun segno = trovato nella definizione di gruppo '%s'\n"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1698
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVVISO: proprietà non sicura su homedir '%s'\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, 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:1714
+#: g10/gpg.c:1704
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVVISO: proprietà non sicura nell'estensione '%s'\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVVISO: proprietà non sicura su homedir '%s'\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, 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:1726
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVVISO: autorizzazioni non sicure per l'estensione '%s'\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "AVVISO: proprietà non sicura su homedir '%s'\n"
 
-#: g10/gpg.c:1735
+#: g10/gpg.c:1725
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2906,21 +2925,21 @@ msgstr ""
 "AVVISO: proprietà della directory di inclusione non sicura nel file di "
 "configurazione '%s'\n"
 
-#: g10/gpg.c:1738
+#: g10/gpg.c:1728
 #, 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:1744
+#: g10/gpg.c:1734
 #, 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:1747
+#: g10/gpg.c:1737
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2928,480 +2947,471 @@ msgstr ""
 "AVVISO: autorizzazioni della directory di inclusione non sicure nella "
 "directory homedir '%s'\n"
 
-#: g10/gpg.c:1750
+#: g10/gpg.c:1740
 #, 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:1966
+#: g10/gpg.c:1956
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "elemento di configurazione sconosciuto '%s'\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr "visualizzare gli ID foto durante le elenchi dei tasti"
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 msgid "show key usage information during key listings"
 msgstr ""
 "mostra le informazioni sull'utilizzo delle chiavi durante le inserzioni "
 "chiave"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr "mostra URL dei criteri durante gli elenchi delle firme"
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 msgid "show all notations during signature listings"
 msgstr "mostra tutte le notazioni durante gli elenchi delle firme"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr "mostra notazioni standard IETF durante gli elenchi delle firme"
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "mostra le notazioni fornite dall'utente durante gli elenchi delle firme"
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "mostra gli URL preferiti del keyserver durante gli elenchi delle firme"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr "mostra validità ID utente durante le inserzioni chiave"
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr "mostra ID utente revocati e scaduti negli elenchi di chiavi"
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr "mostra sottochiavi revocate e scadute negli elenchi di chiavi"
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 msgid "show the keyring name in key listings"
 msgstr "mostrare il nome del keyring negli elenchi delle chiavi"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 msgid "show expiration dates during signature listings"
 msgstr "mostra date di scadenza durante le inserzioni delle firme"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "elenca le preferenze (per esperti)"
+
+#: g10/gpg.c:2197
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "criterio TOFU sconosciuto '%s'\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(utilizzare \"help\" per elencare le scelte)\n"
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Nota: %s non è per uso normale!\n"
 
-#: g10/gpg.c:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' non è una scadenza di firma valida\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" non è un indirizzo di posta elettronica corretto\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "modalità pinentry non valida '%s'\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "origine richiesta non valida '%s'\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' non è un set di caratteri valido\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile analizzare l'URL del server dei chiavi\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni keyserver non valide\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "opzioni keyserver non valide\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opzione di filtro non valida: %s\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di elenco non valide\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr "opzioni di elenco non valide\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr "visualizzare gli ID foto durante la verifica della firma"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr "mostra URL dei criteri durante la verifica della firma"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 msgid "show all notations during signature verification"
 msgstr "mostra tutte le notazioni durante la verifica della firma"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr "mostra notazioni standard IETF durante la verifica della firma"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 "mostra le notazioni fornite dall'utente durante la verifica della firma"
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "mostra gli URL preferiti del keyserver durante la verifica della firma"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 msgid "show user ID validity during signature verification"
 msgstr "mostra validità DELL'ID utente durante la verifica della firma"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "mostra ID utente revocati e scaduti nella verifica della firma"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 msgid "show only the primary user ID in signature verification"
 msgstr "mostra solo l'ID utente primario nella verifica della firma"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di verifica non valide\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr "opzioni di verifica non valide\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, 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:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "elenco di individuazione automatica delle chiavi non valido\n"
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "argomento non valido per l'opzione \"%.50s\"\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non è permesso usare %s con %s!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "AVVISO: in esecuzione con l'ora di sistema falso: "
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, 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:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non è valido\n"
 
-#: g10/gpg.c:3952
-#, c-format
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "l'algoritmo AEAD selezionato non è valido\n"
-
-#: g10/gpg.c:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritmo di compressione selezionato non valido\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:4015
-#, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr "preferenze AEAD personali non valide\n"
-
-#: g10/gpg.c:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "dimensione del blocco non valida - utilizzando %d\n"
 
-#: g10/gpg.c:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "crittografia simmetrica di '%s' non riuscita: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, 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:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, 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:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "esportazione come chiave ssh non riuscita: %s\n"
 
-#: g10/gpg.c:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo hash non valido '%s'\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, 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:5366
+#: g10/gpg.c:5322
 #, 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:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, 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:5726
+#: g10/gpg.c:5682
 #, 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:5759
+#: g10/gpg.c:5715
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL del keyserver preferito specificato non è valido\n"
@@ -3414,7 +3424,7 @@ msgstr "| FILE: prendere le chiavi dal file di tasti"
 msgid "make timestamp conflicts only a warning"
 msgstr "segnala i conflitti di data solo con un avvertimento"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 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"
 
@@ -3443,154 +3453,154 @@ msgstr "Non è disponibile un aiuto"
 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"
@@ -3599,174 +3609,174 @@ msgstr ""
 "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:1998 g10/import.c:3146
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "chiave %s: nessun ID utente\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, c-format
 msgid "key %s: %s\n"
 msgstr "chiave %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr "rifiutato dallo screener di importazione"
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chiave %s: nuova chiave - ignorata\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chiave %s: chiave segreta importata\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, 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:2801
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "chiave %s: errore durante l'invio all'agente: %s\n"
@@ -3779,203 +3789,203 @@ msgstr "chiave %s: errore durante l'invio all'agente: %s\n"
 #. * 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:2970
 #, 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:3117
 #, 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:3138 g10/import.c:3177
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "importazione di chiavi segrete non consentita\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "ragione della revoca: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "commento alla revoca: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, 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:3788
 #, 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:3812
 #, 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:3825
 #, 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:3840
 #, 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:3887
 #, 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:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chiave %s: sottochiave ignorata\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chiave %s: aggiunta firma chiave diretta\n"
@@ -4018,14 +4028,14 @@ msgstr[0] ""
 "\n"
 msgstr[1] "%d firme duplicate rimosse\n"
 
-#: g10/key-check.c:726 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"
 msgstr[0] "%d firma non controllata a causa di una chiave mancante\n"
 msgstr[1] "%d firme non controllate a causa di chiavi mancanti\n"
 
-#: g10/key-check.c:734 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"
@@ -4078,15 +4088,15 @@ msgstr "risorsa keyblock '%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[revocation]"
 msgstr "[revoca]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4098,17 +4108,17 @@ msgstr ""
 "(guardando i passaporti, controllando le impronte digitali da fonti diverse, "
 "ecc.)\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 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:390 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:408
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4118,51 +4128,51 @@ msgstr ""
 "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:425
 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:553
 #, 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:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "L'user ID \"%s\" è scaduto."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "L'user ID \"%s\" non è autofirmato."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "L'ID utente \"%s\" è firmabile.  "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr "Firmarlo? (y/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4171,11 +4181,11 @@ msgstr ""
 "L'autofirma su \"%s\"\n"
 "è una firma in stile PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4184,11 +4194,11 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "è scaduta\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4197,43 +4207,43 @@ msgstr ""
 "La tua firma attuale su \"%s\"\n"
 "è una firma locale.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "Questa chiave è scaduta!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4243,31 +4253,31 @@ msgstr ""
 "appartiene veramente alla persona indicata sopra?\n"
 "Se non sai cosa rispondere digita \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Preferisco non rispondere.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, 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:878
 #, 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:881
 #, 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:888
 msgid "Your selection? (enter '?' for more information): "
 msgstr "La tua scelta? (inserire '?' per ulteriori informazioni): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4276,237 +4286,237 @@ msgstr ""
 "Sei sicuro di voler firmare questa chiave con il tuo\n"
 "chiave \"%s\" (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 msgid "This will be a self-signature.\n"
 msgstr "Questa sarà un'auto-firma.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 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:935
 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:945
 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:952
 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:959
 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:964
 msgid "I have checked this key casually.\n"
 msgstr "Ho controllato questa chiave casualmente.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 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:981
 msgid "Really sign? (y/N) "
 msgstr "Davvero firmare? (y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 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:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 msgid "show key fingerprint"
 msgstr "mostra impronta digitale chiave"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "show the keygrip"
 msgstr "mostrare il keygrip"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr "selezionare la sottochiave N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr "controllare le firme"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 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:1286
 msgid "sign selected user IDs locally"
 msgstr "firmare gli ID utente selezionati localmente"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 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:1289
 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:1291
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr "eliminare gli ID utente selezionati"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr "aggiungere una sottochiave"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr "aggiungere una chiave a una smart card"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr "spostare un tasto in una smart card"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 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:1306
 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:1308
 msgid "delete selected subkeys"
 msgstr "eliminare le sottochiavi selezionate"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "aggiungi una chiave di revoca"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 msgid "delete signatures from the selected user IDs"
 msgstr "eliminare le firme dagli ID utente selezionati"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1314
 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:1316
 msgid "flag the selected user ID as primary"
 msgstr "contrassegnare l'ID utente selezionato come primario"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 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:1325
 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:1327
 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:1329
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 msgid "revoke signatures on the selected user IDs"
 msgstr "revocare le firme sugli ID utente selezionati"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 msgid "revoke selected user IDs"
 msgstr "revocare gli ID utente selezionati"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "revoke key or selected subkeys"
 msgstr "revoca della chiave o delle sottochiavi selezionate"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "enable key"
 msgstr "chiave di abilitazione"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr "tasto di disattivazione"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr "mostra GLI ID foto selezionati"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 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:1349
 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:1470
 msgid "Secret key is available.\n"
 msgstr "È disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 msgid "Secret subkeys are available.\n"
 msgstr "Sono disponibili sottochiavi segrete.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1574
 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:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4519,285 +4529,269 @@ msgstr ""
 "revocabili\n"
 "  (nrsign), o qualsiasi altra combinazione (ltsign, tnrsign, ecc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "La chiave è stata revocata."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 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:1682
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Firmare davvero tutti gli ID utente? (y/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1690
 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:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Utilizzare il comando '%s'.)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 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:1756
 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:1814 g10/keyedit.c:1854
 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 msgid "You must select exactly one key.\n"
 msgstr "È necessario selezionare esattamente una chiave.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 msgid "Command expects a filename argument\n"
 msgstr "Il comando prevede un argomento filename\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "Impossibile aprire '%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, 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:1969
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1975
 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:1977
 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:2015
 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:2016
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Revocare davvero questo ID utente? (y/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2034
 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:2045
 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:2047
 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:2105
 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:2150
 msgid "Set preference list to:\n"
 msgstr "Impostare l'elenco delle preferenze su:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 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:2159
 msgid "Really update the preferences? (y/N) "
 msgstr "Aggiornare davvero le preferenze? (y/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Save changes? (y/N) "
 msgstr "Salvare le modifiche? (y/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr "Uscire senza salvare? (y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, 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:2557
+#: g10/keyedit.c:2558
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "non può revocare l'ultimo ID utente valido.\n"
 
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2584
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "revoca dell'ID utente non riuscita: %s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "impostazione dell'ID utente primario non riuscita: %s\n"
 
-#: g10/keyedit.c:2677
+#: g10/keyedit.c:2717
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" non è un'impronta digitale\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" non è l'impronta digitale primaria\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "ID utente '%s' non valido: %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "No matching user IDs."
 msgstr "Nessun ID utente corrispondente."
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "Nothing to sign.\n"
 msgstr "Niente da firmare.\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Non firmato da te.\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "revoca della firma della chiave non riuscita: %s\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3251
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' non è un'ora di scadenza valida\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" non è un'impronta digitale corretta\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "sottochiave \"%s\" non trovata\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr "AEAD: "
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Digest: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Caratteristiche: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr "Keyserver no-modify"
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Server delle chiavi preferito: "
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr "Notazioni: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr "(sensibile)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "creato: %s"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr "revocato: %s"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr "scaduto: %s"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "scadenza: %s"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr "utilizzo: %s"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr "scheda-no: "
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr "attendibilità: %s"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr "validità: %s"
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Questa chiave è stata disabilitata"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4806,17 +4800,17 @@ msgstr ""
 "corretta\n"
 "finchè non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "scaduto"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4826,17 +4820,17 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "AVVISO: la sottochiave di crittografia scade a breve.\n"
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4845,75 +4839,75 @@ msgstr ""
 "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:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 #, 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:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Firma %d eliminata.\n"
 msgstr[1] "Firme %d eliminate.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Non è stato cancellato nulla.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "non valido"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID utente \"%s\" compattato: %s\n"
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "ID utente \"%s\": firma %d rimossa\n"
 msgstr[1] "ID utente \"%s\": firme %d rimosse\n"
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID utente \"%s\": già ridotto a icona\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID utente \"%s\": già pulito\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4923,218 +4917,218 @@ msgstr ""
 "            designato può causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 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:4719
+#: g10/keyedit.c:4611
 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:4788
+#: g10/keyedit.c:4680
 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:4793
+#: g10/keyedit.c:4685
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modifica dell'ora di scadenza per una sottochiave.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 msgid "Changing usage of a subkey.\n"
 msgstr "Modifica dell'utilizzo di una sottochiave.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 msgid "Changing usage of the primary key.\n"
 msgstr "Modifica dell'utilizzo della chiave primaria.\n"
 
-#: g10/keyedit.c:5033
+#: g10/keyedit.c:4925
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "la sottochiave di firma %s è già certificata incrociata\n"
 
-#: g10/keyedit.c:5039
+#: g10/keyedit.c:4931
 #, 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:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, 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:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr "Immettere l'URL del server di chiavi preferito: "
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerlo sostituire? (y/N) "
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerlo eliminare? (y/N) "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 msgid "Enter the notation: "
 msgstr "Immettere la notazione: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 msgid "Proceed? (y/N) "
 msgstr "Procedere? (y/N) "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nessun ID utente con hash %s\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nessuna sottochiave con ID di chiave '%s'.\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessuna sottochiave con indice %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utente: \"%s\"\n"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave è scaduta il %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr " (non revocabile)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocato dalla chiave %s su %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, 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:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" è già stato revocato\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Impossibile revocare l'ultimo ID utente valido.\n"
 
-#: g10/keyedit.c:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La chiave %s è già stata revocata.\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sottochiave %s è già stata revocata.\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5176,33 +5170,33 @@ msgstr "troppe preferenze AEAD\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "elemento '%s' non valido nella stringa delle preferenze\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "scrittura della firma diretta\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "scrittura della autofirma\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5210,19 +5204,19 @@ msgstr ""
 "AVVISO: alcuni programmi OpenPGP non sono in grado di gestire una chiave DSA "
 "con questa dimensione del digest\n"
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr "Firma"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr "Certifica"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr "Crittografa"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr "Autentica"
 
@@ -5236,166 +5230,166 @@ msgstr "Autentica"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "Azioni possibili per una chiave %s: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr "Azioni correnti consentite: "
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Attivare o disattivare la funzionalità di firma\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Attivare/disattivare la funzionalità di crittografia\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Attivare/disattivare la funzionalità di autenticazione\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Finito\n"
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA e RSA%s\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA ed Elgamal%s\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, c-format
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (solo segno)%s\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2113
 #, c-format
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (solo segno)%s\n"
 
-#: g10/keygen.c:2142
+#: g10/keygen.c:2119
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (solo crittografa)%s\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, c-format
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (solo crittografia)%s\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2127
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (impostare le proprie funzionalità)%s\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (impostare le proprie funzionalità)%s\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ECC (firmare e crittografare)%s\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 msgid " *default*"
 msgstr " *predefinito*"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) ECC (impostare le proprie funzionalità)%s\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, c-format
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC (solo crittografia)%s\n"
 
-#: g10/keygen.c:2167
+#: g10/keygen.c:2144
 #, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) Chiave esistente%s\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "  (%d) Chiave esistente dalla carta%s\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Immettere il keygrip: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Nessuna chiave con questa chiave\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 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:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Chiavi disponibili:\n"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "arrotondato a %u bit\n"
 
-#: g10/keygen.c:2570
+#: g10/keygen.c:2547
 #, 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:2578
+#: g10/keygen.c:2555
 #, 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:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 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:2641
+#: g10/keygen.c:2618
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Selezionare la curva ellittica desiderata:\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5411,7 +5405,7 @@ msgstr ""
 "      <n>m = la chiave scadrà dopo n mesi\n"
 "      <n>y = la chiave scadrà dopo n anni\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5427,38 +5421,38 @@ msgstr ""
 "      <n>m = la chiave scadrà dopo n mesi\n"
 "      <n>y = la chiave scadrà dopo n anni\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "La firma è valida per? (%s) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr "La chiave non scade affatto\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr "La firma non scade affatto\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La chiave scade alle %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma scade alle %s\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5466,11 +5460,11 @@ msgstr ""
 "Il tuo sistema non può mostrare date oltre il 2038.\n"
 "Comunque, sarà gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr "È corretto? (y/N) "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5484,7 +5478,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5500,41 +5494,41 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, 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:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non è valido\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Si sta utilizzando il set di caratteri '%s'.\n"
 
-#: g10/keygen.c:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5545,11 +5539,11 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Tale ID utente esiste già in questa chiave!\n"
 
@@ -5564,31 +5558,31 @@ msgstr "Tale ID utente esiste già in questa chiave!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (Q)uit? "
 
-#: g10/keygen.c:3148
+#: g10/keygen.c:3125
 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5600,18 +5594,18 @@ msgstr ""
 "dischi) durante la generazione dei numeri primi; questo da al generatore di\n"
 "numeri casuali migliori possibilità di raccogliere abbastanza entropia.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5622,66 +5616,66 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr "Continuare? (Y/n) "
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Esiste già una chiave per \"%s\"\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 msgid "Create anyway? (y/N) "
 msgstr "Creare comunque? (y/N) "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, c-format
 msgid "creating anyway\n"
 msgstr "creazione comunque\n"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, 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:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "impossibile creare il file di backup '%s': %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "scrittura di chiave pubblica in '%s'\n"
 
-#: g10/keygen.c:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non è stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "errore durante la scrittura della chiave pubblica '%s': %s\n"
 
-#: g10/keygen.c:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 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"
@@ -5690,7 +5684,7 @@ msgstr ""
 "consiglia di utilizzare\n"
 "il comando \"--edit-key\" per generare una sottochiave a questo scopo.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5698,7 +5692,7 @@ msgstr ""
 "la chiave è stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5706,23 +5700,23 @@ msgstr ""
 "la chiave è stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keygen.c:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr "Davvero creare? (y/N) "
 
@@ -5730,34 +5724,50 @@ msgstr "Davvero creare? (y/N) "
 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"
 msgstr[0] "%d buona firma\n"
 msgstr[1] "%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"
@@ -5766,40 +5776,40 @@ msgstr[1] ""
 "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"
 msgstr[0] "Avviso: chiave %lu ignorata a causa delle dimensioni grandi\n"
 msgstr[1] "Avviso: chiavi %lu ignorate a causa delle dimensioni grandi\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Portachiavi"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr " Impronta digitale della chiave primaria:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "     Impronta digitale della subchiave:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr "     Impronta digitale della chiave ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr "      Numero seriale della scheda ="
 
@@ -6170,7 +6180,7 @@ msgstr "binario"
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "sconosciuto"
 
@@ -6309,28 +6319,28 @@ msgstr "Non compresso"
 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:1614
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "opzione ambigua '%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "opzione sconosciuta '%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "digest debole sconosciuto '%s'\n"
@@ -6452,7 +6462,7 @@ msgstr ""
 "creato %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6469,71 +6479,71 @@ msgstr ""
 "molto\n"
 "grande! Dimensioni vicine a 240x288 sono una buona scelta.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:207
 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:228
 #, 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:239
 #, 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:241
 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:257
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "'%s' non è un file JPEG\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Questa foto è giusta? (s/N/q) "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, 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:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "uscita anormale del programma esterno\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6541,7 +6551,7 @@ msgstr ""
 "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:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "impossibile mostrare l'ID fotografico\n"
@@ -6868,12 +6878,12 @@ msgstr "destinatario predefinito sconosciuto \"%s\"\n"
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Nota: la chiave %s non ha funzionalità %s\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Nota: la chiave %s non ha preferenze per %s\n"
@@ -7949,7 +7959,7 @@ msgstr "utilizzo del modello di trust %s\n"
 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"
@@ -7980,31 +7990,31 @@ msgstr "per favore usa --check-trustdb\n"
 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"
 msgstr[0] "Chiave %d elaborata"
 msgstr[1] "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"
 msgstr[0] " (%d conteggio di validità cancellato)\n"
 msgstr[1] " (%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"
@@ -8012,7 +8022,7 @@ msgstr ""
 "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 ""
@@ -8138,7 +8148,7 @@ msgstr ""
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8146,7 +8156,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8176,7 +8186,7 @@ msgstr "|N| Immettere la nuova chiave di sblocco"
 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:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8264,57 +8274,57 @@ msgstr[1] ""
 msgid "response does not contain the public key data\n"
 msgstr "risposta non contiene i dati della chiave pubblica\n"
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Inserisci il PIN di amministratore"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 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:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, 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:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, 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:1654
+#: 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:1701
+#: 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:2074
+#: 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:2082
+#: 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:2092
+#: 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:2102
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8322,7 +8332,7 @@ msgstr ""
 "|NP|Inserisci un nuovo codice di sblocco PIN (PUK) per la chiave per creare "
 "firme qualificate."
 
-#: scd/app-nks.c:2104
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8330,7 +8340,7 @@ msgstr ""
 "|P|Inserisci il codice di sblocco del PIN (PUK) per la chiave per creare "
 "firme qualificate."
 
-#: scd/app-nks.c:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "errore durante il recupero del nuovo PIN: %s\n"
@@ -8594,7 +8604,7 @@ msgstr "gestore per fd %d avviato\n"
 msgid "handler for fd %d terminated\n"
 msgstr "gestore per fd %d terminato\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -8602,7 +8612,7 @@ 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 ""
 
@@ -8611,11 +8621,11 @@ msgstr ""
 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:199 sm/certchain.c:2211
 msgid "chain"
 msgstr "catena"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 msgid "shell"
 msgstr "shell"
 
@@ -8638,237 +8648,237 @@ msgstr "criteri contrassegnati critici senza criteri configurati"
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, 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:626
 #, 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:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "numero di emittenti corrispondenti: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, 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:818
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "numero di certificati corrispondenti: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "impossibile allocare l'handle keyDB\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1260 sm/certchain.c:1264
 msgid "certificate has been revoked"
 msgstr "certificato è stato revocato"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr "lo stato del certificato è sconosciuto"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, 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:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certificato non ancora valido"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 msgid "root certificate not yet valid"
 msgstr "certificato radice non ancora valido"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr "certificato intermedio non ancora valido"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr "certificato è scaduto"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 msgid "root certificate has expired"
 msgstr "certificato radice scaduto"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 msgid "intermediate certificate has expired"
 msgstr "certificato intermedio scaduto"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, 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:1404
 msgid "certificate with invalid validity"
 msgstr "certificato con validità non valida"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr "firma non creata durante la durata del certificato"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr "certificato non creato durante la durata dell'emittente"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 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:1448
 #, c-format
 msgid "  (  signature created at "
 msgstr " (  firma creata alle "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certificato creato alle "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certificato valido da "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     emittente valido da "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "impronta digitale=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, 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:1505
 #, 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:1511
 #, 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:1570
 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:1634
 msgid "no issuer found in certificate"
 msgstr "nessuna autorità emittente trovata nel certificato"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 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:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "certificato radice non contrassegnato come attendibile"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, 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:1844 dirmngr/validate.c:643
 #, 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:1879 dirmngr/validate.c:669
 #, 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:1911 dirmngr/validate.c:693
 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:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr "certificato è buono\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certificato intermedio è buono\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, c-format
 msgid "root certificate is good\n"
 msgstr "certificato radice è buono\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr "passaggio al modello a catena"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr "modello di convalida utilizzato: %s"
@@ -8891,7 +8901,7 @@ msgstr "fuori dal nucleo\n"
 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:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "nessuno"
 
@@ -8926,46 +8936,46 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "creato %s, scade %s.\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, 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:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, 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:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, 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:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, 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:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, 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:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certificato non è utilizzabile per la crittografia\n"
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certificato non è utilizzabile per la firma\n"
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "alla ricerca di un altro certificato\n"
@@ -9524,7 +9534,7 @@ msgstr "algoritmo hash utilizzato per firmatario %d: %s (%s)\n"
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "controllo del certificato qualificato non riuscito: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "%s/%s firma con %s chiave %s\n"
@@ -9718,7 +9728,7 @@ msgstr "rimozione del file di cache '%s'\n"
 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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "errore durante la chiusura del file della cache: %s\n"
@@ -9974,143 +9984,143 @@ msgstr "algoritmo hash sconosciuto '%s'\n"
 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:1849 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:1923
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1938
 #, 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:1945
 #, 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:1949
 #, 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:1969
 #, 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:1984
 #, 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:2011
 #, 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:2026
 #, 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:2072
 #, 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:2084
 #, 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:2226
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2233
 #, 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:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2301
 #, 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:2308
 #, 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:2333
 #, 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:2337
 #, 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:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "estensione CRL critica sconosciuta %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, 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:2414
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "creazione del file di cache '%s'\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, 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:2460
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10119,12 +10129,12 @@ msgstr ""
 "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:2497
 #, 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:2520
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10132,58 +10142,58 @@ msgstr ""
 " ERRORE: il CRL non verrà utilizzato perché era ancora troppo vecchio dopo "
 "un aggiornamento!\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2523
 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:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr " ERRORE: il CRL non verrà utilizzato\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 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:2551
 #, 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:2558
 #, 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:2569
 #, 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:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr "Fine dump CRL\n"
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch tramite DP non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert tramite DP non riuscito: %s\n"
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert tramite autorità emittente non riuscita: %s\n"
@@ -10534,12 +10544,12 @@ msgstr "utilizzo: %s [opzioni] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "due punti non sono consentiti nel nome del socket\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "recupero CRL da '%s' non riuscito: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "elaborazione CRL da '%s' non riuscita: %s\n"
@@ -10786,95 +10796,95 @@ msgstr "hash della risposta OCSP per '%s' non riuscito: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "non firmato da un certificato del firmatario OCSP predefinito"
 
-#: dirmngr/ocsp.c:582
+#: 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:598 dirmngr/ocsp.c:782
+#: 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:642
+#: 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:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "certificato dell'autorità emittente non trovato: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: 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:698
+#: 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:708
+#: 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:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "nessun risponditore OCSP predefinito definito\n"
 
-#: dirmngr/ocsp.c:753
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "nessun firmatario OCSP predefinito definito\n"
 
-#: dirmngr/ocsp.c:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "utilizzando il risponditore OCSP predefinito '%s'\n"
 
-#: dirmngr/ocsp.c:765
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "utilizzo del risponditore OCSP '%s'\n"
 
-#: dirmngr/ocsp.c:822
+#: 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:847
+#: 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:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "buono"
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: 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:901
+#: 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:916
+#: 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"
@@ -10888,63 +10898,63 @@ msgstr "assuan_inquire(%s) non riuscito: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire non riuscito: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "errore durante l'invio dei dati: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch non riuscito: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1776
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert non riuscito: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d superato\n"
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "impossibile allocare la struttura di controllo: %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "impossibile allocare il contesto assuan: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "impossibile inizializzare il server: %s\n"
 
-#: dirmngr/server.c:3062
+#: dirmngr/server.c:3078
 #, 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:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Problema di accettazione assuan: %s\n"
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Elaborazione Assuan non riuscita: %s\n"
@@ -11250,34 +11260,34 @@ msgstr ""
 "Sintassi: gpg-check-pattern [opzioni] patternfile\n"
 "Controllare una passphrase data su stdin rispetto al patternfile\n"
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: 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:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: 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:3437 tools/gpg-card.c:3451
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -11287,47 +11297,56 @@ msgstr ""
 "         può essere ripristinato solo utilizzando un ripristino delle "
 "impostazioni di fabbrica!\n"
 
-#: tools/gpg-card.c:3454
+#: 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:3700
+#: tools/gpg-card.c:3758
 msgid "authenticate to the card"
 msgstr "eseguire l'autenticazione nella scheda"
 
-#: tools/gpg-card.c:3702
+#: 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:3704
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "configurazione KDF per l'autenticazione PIN"
 
-#: tools/gpg-card.c:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr "modificare un oggetto dati privato"
 
-#: tools/gpg-card.c:3707
+#: 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:3708
+#: 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:3709
+#: 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:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr "Comandi di gestione Yubikey"
 
-#: tools/gpg-card.c:3712
+#: 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"
diff --git a/po/ja.gmo b/po/ja.gmo
index 1340e05..7f52606 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index 4cee524..376865e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.3.8\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2022-09-01 14:45+0900\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: none\n"
@@ -144,8 +144,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "パスフレーズ:"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "一致���ん - も�一度"
 
@@ -194,17 +194,17 @@ msgstr "注�: ウェブブラウザ�ら�リクエスト��。"
 msgid "Note: Request from a remote site."
 msgstr "注�: リモートサイト�ら�リクエスト��。"
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "カード・シリアル番���得エラー: %s\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "��パスフレーズをも�一度入力������"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -213,7 +213,7 @@ msgstr ""
 "%sシステム�イン�ート�れ�オブジェクトを�護�る���パスフレーズを入力�"
 "�����"
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -226,25 +226,25 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "'%s'�開���ん: %s\n"
@@ -254,12 +254,12 @@ msgstr "'%s'�開���ん: %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "�当�カード���見��り��ん: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "カード�リスト ��得エラー: %s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -268,20 +268,20 @@ msgstr ""
 "sshプロセス�以下���使用を�求����:%%0A  %s%%0A  (%s)%%0A��使用を�"
 "����?"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr "許��る"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr "拒��る"
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -290,7 +290,7 @@ msgstr ""
 "パスフレーズを入力������。gpg-agent����管��信��秘密�%%0A   %s"
 "%%0A   %s%%0Aを�護���。"
 
-#: agent/command-ssh.c:3797
+#: agent/command-ssh.c:3837
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "ソケット�らストリームを作��る��失敗����: %s\n"
@@ -412,206 +412,212 @@ msgstr "新���を�護�る����%0Aパスフレーズを入力�
 msgid "Please enter the new passphrase"
 msgstr "新��パスフレーズを入力������"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr "起動�使�れるオプション"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr "デーモン・モード�実行 (�ックグラウンド)"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr "サー�・モード�実行 (フォアグラウンド)"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "コンソール�らデタッ����"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr "sh-形��コマンド出力"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr "csh-形��コマンド出力"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|FILE�らオプションを読�込���"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr "診断出力を制御�るオプション"
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "冗長"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "��ら������"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|FILE�サー�・モード�ログを書�出�"
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr "コンフィグレーションを制御�るオプション"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 msgid "do not use the SCdaemon"
 msgstr "SCdaemonを使���"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|PGMをSCdaemonプログラム���使�"
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|PGMをtpm2daemonプログラム���使�"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|NAME�ら�コマンドを��付�る"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr "TTY�変更�求を無視�る"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr "Xディスプレイ�変更�求を無視�る"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 msgid "enable ssh support"
 msgstr "sshサ�ートを有功��る"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|ssh署��表示�ALGOを使�"
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 msgid "enable putty support"
 msgstr "puttyサ�ートを有功��る"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "puttyサ�ートを有功��る"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "セキュリティを制御�るオプション"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|N秒後�����PINを無効��る"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|N秒後�SSH�を無効��る"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|最大PINキャッシュ存続時間をN秒��る"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|最大SSH�存続時間をN秒��る"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr "署��対��PIN���を使���"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 msgid "disallow the use of an external password cache"
 msgstr "外部�パスワードキャッシュ�使用を����"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "クライアント���\"trusted\"マークを��る��を����"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 msgid "allow presetting passphrase"
 msgstr "パスフレーズ�事�設定を��る"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr "パスワード・�リシー�強制オプション"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr "パスワード・�リシーを迂回�る��を����"
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|新��パスフレーズ�必���る最低長をN��る"
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 "|N|新��パスフレーズ���アルファベット���キャラクタを最低N必���る"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|新��パスフレーズをFILE�パターン�対���ェック�る"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|N日後�パスフレーズを期�切れ��る"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 msgid "do not allow the reuse of old passphrases"
 msgstr "��パスフレーズを�使用�る��を����"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr "PIN-Entryを制御�るオプション"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 msgid "never use the PIN-entry"
 msgstr "PIN-Entryを決��使���"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr "pinentryより優先��パスフレーズ入力を����"
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "PIN-Entry�キーボード�マウスを�有��る"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|PGMをPIN入力プログラム���使�"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|Pinentry�タイムアウトをN秒��る"
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: 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:570
+#: agent/gpg-agent.c:582
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "使�方: @GPG_AGENT@ [オプション] (ヘルプ� -h)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -619,135 +625,135 @@ msgstr ""
 "形�: @GPG_AGENT@ [オプション] [コマンド [引数]]\n"
 "@GnuPG@�秘密��管�\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "無効�debug-level '%s'�与�られ���\n"
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "�択�れ�ダイジェスト・アルゴリズム��無効��\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "'%s' �らオプションを読�込���\n"
 
-#: agent/gpg-agent.c:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "*警告*: \"%s\"��廃止�れ�オプション��\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "ソケット�作�����ん: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "ソケット�'%s'�長����\n"
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "稼�中� %s �らソケットを奪������\n"
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent�既�実行�れ���� - 新��も�をスタート����ん\n"
 
-#: agent/gpg-agent.c:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "ソケット�ナンス�得エラー\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "'%s'�ソケット��インド�エラー: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "'%s'�許��設定����ん: %s\n"
 
-#: agent/gpg-agent.c:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "ソケット'%s'�listen\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "ディレクトリ'%s'�作�����ん: %s\n"
 
-#: agent/gpg-agent.c:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "ディレクトリ'%s'�作��れ���\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "'%s'�stat()�失敗����: %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "'%s'をホーム・ディレクトリ�使���ん\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fd %d�ナンス�読�込�エラー: %s\n"
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "�ンドラ0x%lx (fd %d �対�る)�開始\n"
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "�ンドラ0x%lx (fd %d �対�る)�終了\n"
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh �ンドラ0x%lx (fd %d �対�る)�開始\n"
 
-#: agent/gpg-agent.c:2853
+#: agent/gpg-agent.c:2967
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh �ンドラ0x%lx (fd %d �対�る)�終了\n"
 
-#: agent/gpg-agent.c:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect�失敗����: %s - 一秒待���\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s �止����\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1014,7 +1020,7 @@ msgstr "作��れ�署��検査�失敗����: %s\n"
 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:1602
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "公開�アルゴリズム%d (%s)�サ�ート�れ����ん\n"
@@ -1029,52 +1035,52 @@ msgstr "�護アルゴリズム%d (%s)�サ�ート�れ����ん\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1104,18 +1110,18 @@ msgstr "警告: '%s'�安全���所有 \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告: '%s'�安全���許� \"%s\"\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "ファイル'%s'�アクセス��る�を待���...\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "yes"
 
@@ -1169,8 +1175,8 @@ msgstr "%lu�イト�確�����セキュア・メモリ�足り��
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "�分�メモリ�確��エラー: %s\n"
@@ -1192,68 +1198,68 @@ msgstr ""
 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:432 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"
@@ -1401,11 +1407,11 @@ msgstr "証明書��ェイン�有効"
 msgid "Root certificate trustworthy"
 msgstr "信頼��るルート証明書"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 msgid "no CRL found for certificate"
 msgstr "証明書�対�るCRL��り��ん"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 msgid "the available CRL is too old"
 msgstr "利用��るCRL������"
 
@@ -1442,7 +1448,7 @@ msgstr "'%s'�ヘルプ��り��ん。"
 msgid "ignoring garbage line"
 msgstr "ガベージ行を無視���"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "[none]"
 msgstr "[未設定]"
 
@@ -1486,36 +1492,36 @@ msgstr "iconv_open�失敗����: %s\n"
 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
 #, 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"
@@ -1525,92 +1531,92 @@ msgstr "lock %s を待���...\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s ������ (%s �必���在 %s)\n"
 
-#: g10/armor.c:441
+#: 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"
@@ -1618,12 +1624,12 @@ msgstr ""
 "外装�中�quoted printable文字��り��。��ら��グ��るMTA�使�れ���"
 "�ょ�\n"
 
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, c-format
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "[ 人��読���ん (%zu�イト: %s%s) ]"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1631,32 +1637,32 @@ msgid ""
 msgstr ""
 "注釈����字�能�文字�空白��を使��'='�終�ら��れ��り��ん\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "ユーザ注釈���'@'文字を����れ��り��ん\n"
 
-#: g10/build-packet.c:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "ユーザ注釈���一�より大��'@'文字を�ん���り��ん\n"
 
-#: g10/build-packet.c:1550
+#: g10/build-packet.c:1568
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "注釈��値�制御文字を使�������ん\n"
 
-#: g10/build-packet.c:1606
+#: g10/build-packet.c:1624
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "ユーザ注釈���'='�文字を�ん���り��ん\n"
 
-#: g10/build-packet.c:1612
+#: g10/build-packet.c:1630
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr "注釈����字�能�文字�空白��を使���れ��り��ん\n"
 
-#: g10/build-packet.c:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "*警告*: 無効�注釈データを発見\n"
@@ -1670,7 +1676,7 @@ msgstr "プロキシ%sã�®ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã�¸ã�®å•�ã�„å�ˆã‚�ã�›ã�Œå¤±æ•—ã�—ã�¾ã
 msgid "Enter passphrase: "
 msgstr "パスフレーズを入力: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 g10/sign.c:473
 #: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
@@ -1687,7 +1693,7 @@ msgstr "TPM�ら�エラー: %s\n"
 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:2330
+#: 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"
@@ -1727,169 +1733,169 @@ msgstr "サーãƒ�ã�‹ã‚‰ã�®å�—ã�‘容れるã�“ã�¨ã�®ã�§ã��ã�ªã�„HTTPりダイレã‚
 msgid "server uses an invalid certificate"
 msgstr "サー��無効�証明書を使�����"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "�����択�? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "Mr."
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "Ms."
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "強制��"
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "強制"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 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:1500
+#: g10/card-util.c:803 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:1502
+#: g10/card-util.c:805 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "エラー: 二��空白��止��。\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "カード所有者�姓 (surname): "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "カード所有者�� (given name): "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "ログイン・データ (アカウント�): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "プライベート DO データ: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "言語�優先指定: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 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:1800
+#: g10/card-util.c:1199 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "エラー: 無効�応答。\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "CA�フィンガープリント: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "エラー: 無効�形��フィンガープリント。\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1296
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "���作����ん: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1297
 msgid "not an OpenPGP card"
 msgstr "OpenPGPカード��り��ん"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�行�情報��得エラー: %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1395
 msgid "Replace existing key? (y/N) "
 msgstr "既存��を置�������? (y/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -1900,100 +1906,100 @@ msgstr ""
 "      ��ん。�生���功���場������カード�関�る技術文書を\n"
 "      確���サ�ート�れる�タイプや�長����確�����。\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�長�? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr "��ら�カード��属性を変更���: "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 msgid "Signature key\n"
 msgstr "署��\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 msgid "Encryption key\n"
 msgstr "暗�化�\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr "�証�\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "無効��択��。\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "注�: 秘密��も�カード��管���り��!\n"
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2429
+#: g10/card-util.c:1694 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "既存��を置������? (y/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2004,176 +2010,176 @@ msgstr ""
 "   PIN = '%s'     管�者PIN = '%s'\n"
 "次�コマンドを使��変更����� --change-pin\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 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:1743 g10/card-util.c:1833
 msgid "   (1) Signature key\n"
 msgstr "   (1) 署��\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1744 g10/card-util.c:1835
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 暗�化�\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr "   (3) �証�\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 msgid "Please select where to store the key:\n"
 msgstr "�を�管�る場所を�択������:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1876
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD�失敗����: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "工場出�リセットを行����? (本当�ら \"yes\" �入力) "
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "KDF設定�エラー: %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "��メニューを終了"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr "管�コマンドを表示"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "��ヘルプを表示"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "全有効データを表示"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "カード所有者����変更"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "�を�得�るURL�変更"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3689
+#: g10/card-util.c:2262 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:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "ログイン��変更"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "言語�優先指定�変更"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr "カード所有者�敬称�変更"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "CAフィンガープリント�変更"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "署�強制PINフラグを�転"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "新���を生�"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "PINブロック�解除や変更�メニュー"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3698
+#: g10/card-util.c:2271 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "PINを確������データを表示�る"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "PINをリセット・コード�ブロックを解除�る"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr "������データを破壊���"
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "PIN�証�KDFを設定�る (on/single/off)"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2276
 msgid "change the key attribute"
 msgstr "��属性�変更"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 tools/gpg-card.c:3763
 msgid "change the User Interaction Flag"
 msgstr "ユーザインタラクションフラグ�変更"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 msgid "Admin-only command\n"
 msgstr "管�者専用コマンド\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr "管�者コマンド�許��れ����\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 msgid "Admin commands are not allowed\n"
 msgstr "管�者コマンド��止�れ����\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無効�コマンド (\"help\"を�照)\n"
 
-#: g10/decrypt.c:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "��コマンド�--output�機能���ん\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2231,9 +2237,9 @@ msgstr "�"
 msgid "subkey"
 msgstr "副�: "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新�失敗����: %s\n"
@@ -2265,18 +2271,18 @@ msgid ""
 msgstr ""
 "*警告*: 共通�暗�方� %s (%d) �強制����人�優先指定を�む���\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, c-format
 msgid "cipher algorithm '%s' may not be used for encryption\n"
 msgstr "暗�アルゴリズム'%s'を暗�化�使��������ん\n"
 
-#: g10/encrypt.c:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr "(オー�ーライド�る���オプション\"%s\"を使���)\n"
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "暗�アルゴリズム'%s'を%sモード�使��������ん\n"
@@ -2286,43 +2292,44 @@ msgstr "暗�アルゴリズム'%s'を%sモード�使��������
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "*警告*: �%s��%sモード���暗�化�����ん\n"
 
-#: g10/encrypt.c:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "パスフレーズ�作�エラー: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, c-format
 msgid "using cipher %s.%s\n"
 msgstr "暗�方� %s.%s を使���\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s'�も�圧縮済���\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "*警告*: '%s'�空�ファイル��\n"
 
-#: g10/encrypt.c:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "ダイジェスト・アルゴリズム'%s'を%sモード�使��������ん\n"
 
-#: g10/encrypt.c:862
+#: g10/encrypt.c:853
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "'%s'�ら読�込�\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2330,12 +2337,12 @@ msgid ""
 msgstr ""
 "*警告*: 圧縮アルゴリズム %s (%d) �強制����人�優先指定を�む���\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, c-format
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s.%s 暗�化 �信者:\"%s\"\n"
 
-#: g10/encrypt.c:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "オプション'%s'を%sモード�使��������ん\n"
@@ -2361,61 +2368,73 @@ msgstr "*警告*: メッセージã�¯å…±é€šé�µæš—å�·æ–¹å¼�ã�®å¼±ã�„é�µã�§æš—å�·åŒ
 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
+#, 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "*警告*: 何もエクス�ート�れ����ん\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2479,7 +2498,7 @@ msgstr "--allow-non-selfsigned-uid�有効��れ�無効��%s��\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "副�%s(主�%s����)を用���\n"
 
-#: g10/getkey.c:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "オプション'%s'�有効�値:\n"
@@ -2552,111 +2571,111 @@ msgstr "��や�ユーザIDを失効"
 msgid "quickly set a new expiration date"
 msgstr "��や�新��有効期�を設定"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr "全機能��ペアを生�"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "失効証明書を生�"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "公開�リング�ら�を削除"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "秘密�リング�ら�を削除"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "quickly sign a key"
 msgstr "��や���署�"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 msgid "quickly sign a key locally"
 msgstr "��や���ローカル�署�"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "quickly revoke a key signature"
 msgstr "��や����署�を失効"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "��署�"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "��ローカル�署�"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "���署�や編集"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "パスフレーズ�変更"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "�をエクス�ート�る"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "�サー���をエクス�ート�る"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "�サー��ら�をイン�ート�る"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "�サー���を検索�る"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "�サー��ら�を全部更新�る"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "��イン�ート/マージ"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr "カード・ステイタスを表示"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr "カード�データを変更"
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr "カード�PINを変更"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "信用データベースを更新"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 msgid "print message digests"
 msgstr "メッセージ・ダイジェストを表示"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "サー�・モード�実行"
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|TOFU�リシーを��設定�る"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|デフォルト�秘密����NAMEを用�る"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|ユーザID NAME�も暗�化�る"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|電�メールエイリアスを設定�る"
 
@@ -2672,51 +2691,51 @@ msgstr "無変更"
 msgid "prompt before overwriting"
 msgstr "上書���確�"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr "入力を制御�るオプション"
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr "出力を制御�るオプション"
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "ASCII形��外装を作�"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|出力をFILE�書�出�"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "正準テキスト・モードを使用"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|圧縮レベルをN�設定 (0��圧縮)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr "��イン�ート�エクス�ートを制御�るオプション"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|メールアドレス�よ���を特定�る際�MECHANISMSを使用�る"
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 msgid "import missing key from a signature"
 msgstr "署��ら手元����をイン�ート�る"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 msgid "include the public key in signatures"
 msgstr "署��公開�を��る"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "dirmngr������アクセスを無効��る"
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr "��リスティングをを制御�るオプション"
 
@@ -2740,7 +2759,7 @@ msgstr "無人使用����オプション"
 msgid "Other options"
 msgstr "�����オプション"
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2748,7 +2767,7 @@ msgstr ""
 "@\n"
 "(コマンド�オプション全部�一覧��マニュアル・ページを�覧����)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2768,11 +2787,11 @@ msgstr ""
 " --list-keys [��]         �を表示\n"
 " --fingerprint [��]       フィンガープリントを表示\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "使�方: @GPG@ [オプション] [ファイル] (ヘルプ� -h)"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1172
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2782,7 +2801,7 @@ msgstr ""
 "署��検査�暗�化���復�\n"
 "デフォルト��作��入力データ��存\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2790,558 +2809,549 @@ msgstr ""
 "\n"
 "サ�ート���るアルゴリズム:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "公開�: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "暗�方�: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "�ッシュ: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "圧縮: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "使�方: %s [オプション] %s\n"
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "対立�るコマンド\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "=記���グループ定義'%s'内�見��り��ん\n"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1698
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'�安全���所有\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "*警告*: コンフィグレーション・ファイル'%s'�安全���所有\n"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'�安全���所有\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'�安全���許�\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "*警告*: コンフィグレーション・ファイル'%s'�安全���許�\n"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'�安全���許�\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'�安全���上�ディレクトリ所有\n"
 
-#: g10/gpg.c:1735
+#: g10/gpg.c:1725
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "*警告*: コンフィグレーション・ファイル'%s'�安全���上�ディレクトリ所有\n"
 
-#: g10/gpg.c:1738
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'�安全���上�ディレクトリ所有\n"
 
-#: g10/gpg.c:1744
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'�安全���上�ディレクトリ許�\n"
 
-#: g10/gpg.c:1747
+#: g10/gpg.c:1737
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr ""
 "*警告*: コンフィグレーション・ファイル'%s'�安全���上�ディレクトリ許�\n"
 
-#: g10/gpg.c:1750
+#: g10/gpg.c:1740
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'�安全���上�ディレクトリ許�\n"
 
-#: g10/gpg.c:1966
+#: g10/gpg.c:1956
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "�明�コンフィグレーション項目'%s'\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr "��一覧時�フォトIDを表示�る"
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 msgid "show key usage information during key listings"
 msgstr "��一覧時���使�方�情報を表示�る"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr "署��一覧時��リシーURLを表示�る"
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 msgid "show all notations during signature listings"
 msgstr "署��一覧時�����注釈を表示�る"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr "署��一覧時�IETF標準注釈を表示�る"
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr "署��一覧時�ユーザ�注釈を表示�る"
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "署��一覧時�優先�サー�URLを表示�る"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr "��一覧時�ユーザID�有効性を表示�る"
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr "��一覧�失効��ユーザID�期�切れ����ユーザIDを表示�る"
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr "��一覧�失効��副��期�切れ����副�を表示�る"
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 msgid "show the keyring name in key listings"
 msgstr "��一覧��リング���を表示�る"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 msgid "show expiration dates during signature listings"
 msgstr "署��一覧時�有効期��日付を表示�る"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "優先指定�一覧 (エキスパート)"
+
+#: g10/gpg.c:2197
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "�明�TOFU�リシー'%s'\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(�択肢�一覧��\"help\"を使������)\n"
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%sモード���コマンド��止��。\n"
 
-#: g10/gpg.c:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "注�: 普通%s�使���ん!\n"
 
-#: g10/gpg.c:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s'��有効�署�表����り��ん\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\"�正��メール・アドレス���り��ん\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "無効� pinentry mode '%s'��\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "無効��信元�求 '%s' ��\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s'��有効�文字集����り��ん\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "�サー��URLを解��能\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無効��サー�・オプション��\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "無効��サー�・オプション��\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無効�イン�ート・オプション��\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "無効�イン�ート・オプション��\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "無効�フィルタ・オプション��: %s\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無効�エクス�ート・オプション��\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "無効�エクス�ート・オプション��\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無効�一覧オプション��\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr "無効�一覧オプション��\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr "署��検証時�フォトIDを表示�る"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr "署��検証時��リシーURLを表示�る"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 msgid "show all notations during signature verification"
 msgstr "署��検証時�����注釈を表示�る"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr "署��検証時�IETF標準注釈を表示�る"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr "署��検証時�ユーザ�注釈を表示�る"
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "署��検証時�優先�サー�URLを表示�る"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 msgid "show user ID validity during signature verification"
 msgstr "署��検証時�ユーザID�有効性を表示�る"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "署��検証時�失効��ユーザID�期�切れ����ユーザIDを表示�る"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 msgid "show only the primary user ID in signature verification"
 msgstr "署��検証時�プライマリ・ユーザID��をを表示�る"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無効�検証オプション��\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr "無効�検証オプション��\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-pathを%s�設定�能\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無効� auto-key-locate リスト��\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "無効� auto-key-locate リスト��\n"
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "オプション\"%.50s\"��無効�引数��\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "*警告*: プログラム�coreファイルを作��る����り��!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "*警告*: %s�%sより優先\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s�%s��も�使��������ん!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s�%s��も�使��も無�味��!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "*警告*: ニセモノ�システム時刻�実行�����: "
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s ����セキュア���メモリ�実行���ん\n"
 
-#: g10/gpg.c:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "�択�れ�暗�アルゴリズム�無効��\n"
 
-#: g10/gpg.c:3952
-#, c-format
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "�択�れ�AEADアルゴリズム�無効��\n"
-
-#: g10/gpg.c:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "�択�れ�圧縮アルゴリズム�無効��\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "�択�れ�証明書ダイジェスト・アルゴリズム�無効��\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�正�値�必���\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed�1より大��値�必���\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注�: �純�S2Kモード(0)�使用��強��対���\n"
 
-#: g10/gpg.c:4001
+#: g10/gpg.c:3964
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無効�S2Kモード。0�1�3���れ��り��ん\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "無効�デフォルト�優先指定\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "無効�個人用暗�方��優先指定\n"
 
-#: g10/gpg.c:4015
-#, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr "無効�個人用AEAD方��優先指定\n"
-
-#: g10/gpg.c:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "無効�個人用ダイジェスト�優先指定\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "無効�個人用圧縮�優先指定\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "無効��ャンク長 - %dビット����\n"
 
-#: g10/gpg.c:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s�%s����機能���ん\n"
 
-#: g10/gpg.c:4137
-#, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "AEADアルゴリズム'%s'を%sモード�使��������ん\n"
-
-#: g10/gpg.c:4149
+#: g10/gpg.c:4097
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "圧縮アルゴリズム'%s'を%sモード�使��������ん\n"
 
-#: g10/gpg.c:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信用データベース��期化�失敗����: %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "*警告*: 公開�暗�を使������人 (-r) を指定�����\n"
 
-#: g10/gpg.c:4388
+#: g10/gpg.c:4336
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "'%s'�共通�暗��失敗����: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encryptを--s2k-mode 0�使��������ん\n"
 
-#: g10/gpg.c:4420
+#: g10/gpg.c:4368
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "--symmetric --encryptを%sモード�使��������ん\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4426
 #, 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:4481
+#: g10/gpg.c:4429
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "--symmetric --sign --encryptを%sモード�使��������ん\n"
 
-#: g10/gpg.c:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�サー����信�失敗����: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�サー��ら��信�失敗����: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "��エクス�ート�失敗����: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "ssh�����エクス�ート�失敗����: %s\n"
 
-#: g10/gpg.c:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�サー��検索�失敗����: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�サー��更新�失敗����: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "外装除去�失敗����: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "外装�失敗����: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "無効��ッシュ・アルゴリズム'%s'��\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "�指定'%s'�構文解�エラー: %s\n"
 
-#: g10/gpg.c:5310
+#: g10/gpg.c:5266
 #, 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:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 "*警告*: コマンド�指定�れ����ん。��を�味���る��当����"
 "� ...\n"
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "開始���。メッセージを打������ ...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "���られ�証明書�リシーURL�無効��\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "���られ�署��リシーURL�無効��\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "指定�れ�優先�サー�URL�無効��\n"
@@ -3354,7 +3364,7 @@ msgstr "|FILE|�リングFILE��を扱���"
 msgid "make timestamp conflicts only a warning"
 msgstr "日時�矛盾を警告������"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|��FD�ステイタス情報を書�出�"
 
@@ -3383,153 +3393,153 @@ msgstr "ヘルプ��り��ん"
 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"
@@ -3538,171 +3548,171 @@ 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
 #, 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:1998 g10/import.c:3146
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "�%s: ユーザID��り��ん\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, c-format
 msgid "key %s: %s\n"
 msgstr "�  %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr "イン�ート�検査�拒��れ���"
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "�%s: PKS�副�変造を修復\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2075
 #, 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:2086 g10/import.c:2117
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "�%s: 有効�ユーザID��り��ん\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2088
 #, 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:2167 g10/import.c:3533
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "�%s: 公開��見��り��ん: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2173
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "�%s: 新����� - スキップ���\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "�リング'%s'�書�込�エラー: %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2240
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "�%s: 公開�\"%s\"をイン�ート����\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2267
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "�%s: ��ら�複製�����ん\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2335
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "�%s: \"%s\" 新��ユーザIDを1個\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2338
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "�%s: \"%s\" 新��ユーザIDを%d個\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2341
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "�%s: \"%s\" 新��署�を1個\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2344
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "�%s: \"%s\" 新��署�を%d個\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2347
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "�%s: \"%s\" 新��副�を1個\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "�%s: \"%s\" 新��副�を%d個\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "�%s: \"%s\" %d個�署�を�れ������\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "�%s: \"%s\" %d個�署�を�れ������\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "�%s: \"%s\" %d個�ユーザIDを�れ������\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "�%s: \"%s\" %d個�ユーザIDを�れ������\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2398
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "�%s:\"%s\"変更��\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2785 g10/import.c:2980
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "�%s: 秘密�をイン�ート����\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "� %s: 秘密��も��り��\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2801
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "� %s: エージェント���信エラー: %s\n"
@@ -3715,197 +3725,197 @@ msgstr "� %s: エージェント���信エラー: %s\n"
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "'%s'�移行���スマードカード�れ�れ��以下を実行������: %s\n"
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "秘密� %s: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3138 g10/import.c:3177
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "秘密��イン�ート��止��\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "ユーザID�も�や有効��り��ん"
 
-#: g10/import.c:3387 g10/keylist.c:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "失効�由: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "失効�コメント: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "�%s: 公開���り��ん - 失効証明書を�用����ん\n"
 
-#: g10/import.c:3485
+#: g10/import.c:3555
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "�%s: 元��ブロック��置������ん: %s\n"
 
-#: g10/import.c:3492
+#: g10/import.c:3562
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "�%s: 元��ブロックを読�込���ん: %s\n"
 
-#: g10/import.c:3512
+#: g10/import.c:3582
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "�%s: 無効�失効証明書: %s - 拒�\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "�%s:\"%s\"失効証明書をイン�ート����\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3703
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "�%s: 署��対応�るユーザID��り��ん\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "�%s: サ�ート�����公開�アルゴリズム��\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "�%s: 無効�直接�署�\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "�%s: ��対応�る副���り��ん\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3769
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "�%s: 無効�副��対応��\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3788
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "�%s: 多�副��対応を削除���\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3812
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "�%s: �失効�対�る副���り��ん\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "�%s: 無効�副�失効��\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3840
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "�%s: 無効�副��多�失効を削除���\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3887
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "�%s: スキップ��ユーザID\"%s\"\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "�%s: スキップ��副�\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "�%s: 失効証明書�誤��設定�れ���� - スキップ���\n"
 
-#: g10/import.c:3902
+#: g10/import.c:3985
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "�%s: 無効�失効証明書: %s - スキップ���\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4009
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "�%s: 副�署��場所��誤����� - スキップ���\n"
 
-#: g10/import.c:3924
+#: g10/import.c:4017
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "�%s: 予期��署�クラス (0x%02X) - スキップ���\n"
 
-#: g10/import.c:4097
+#: g10/import.c:4190
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "�%s: �複��ユーザID�検出 - マージ\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4297
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "�%s: �複��副��検出 - マージ\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4362
 #, 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:4378
 #, 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:4444
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "�%s:\"%s\"失効証明書�追加\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4482
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "�%s: 直接�署�を追加\n"
@@ -3942,13 +3952,13 @@ msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "%d個��複��署��除去�れ���\n"
 
-#: g10/key-check.c:726 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"
 msgstr[0] "������%d個�署��検査���ん\n"
 
-#: g10/key-check.c:734 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"
@@ -3999,15 +4009,15 @@ msgstr "keyblock リソース'%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "�リング・キャッシュ��構築�失敗����: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[revocation]"
 msgstr "[失効]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[自己署�]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4018,17 +4028,17 @@ msgstr ""
 "(パス�ートを見��もら��り�他�ら得�フィンガープリントを検査��り���"
 "��)\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 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:390 g10/pkclist.c:291
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 充分�信用�る\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:408
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4037,50 +4047,50 @@ msgstr ""
 "信用署��深�を入力������。\n"
 "深��1より大����署��よ�����る��信用署�を作れ��。\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:425
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "署�を制��るドメインを入力�る��空行を入力������。\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:553
 #, 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:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  署��能。\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ユーザID \"%s\"��期�切れ��。"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "ユーザID \"%s\"��自己署��れ����ん。"
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ユーザID \"%s\"�署��能��。 "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr "署�����? (y/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4089,11 +4099,11 @@ msgstr ""
 "\"%s\"�対�る自己署���\n"
 "PGP 2.x形��署���。\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4102,11 +4112,11 @@ msgstr ""
 "\"%s\"�対�る����今�署�\n"
 "�期�切れ��。\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4115,43 +4125,43 @@ msgstr ""
 "\"%s\"�対�る����今�署�\n"
 "�ローカル�署���。\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "エクス�ート�能�署��格上�������? (y/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:748
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\"��%s�も�ローカル�署����り��\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\"��%s�も�署����り��\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:758
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "�れ�も�署�������? (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "�%s�署����も���り��ん\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:804
 msgid "This key has expired!"
 msgstr "����期�切れ��!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "����%s�期��切れ��。\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "�時�署�も期�切れ�������? (Y/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4160,31 +4170,31 @@ msgstr ""
 "署��よ�����る��実際�上記����人�も��������程度\n"
 "注���検証�����? 答���ら��れ��\"0\"を入力������。\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 答���ん。%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 全然�検査�����ん。%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 一応�検査����。%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:881
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) ��り注���検査����。%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:888
 msgid "Your selection? (enter '?' for more information): "
 msgstr "�択�? (詳細� '?'): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4193,228 +4203,228 @@ msgstr ""
 "本当����������\"%s\"�署���よ����\n"
 "(%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 msgid "This will be a self-signature.\n"
 msgstr "自己署���る��ょ�。\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "*警告*: 署���エクス�ート���設定�れ��ん。\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "*警告*: 署���失効���設定�れ��ん。\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:945
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "署���エクス�ート���設定�れ��。\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:952
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "署���失効���設定�れ��。\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "I have not checked this key at all.\n"
 msgstr "����全然�検査�����ん。\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 msgid "I have checked this key casually.\n"
 msgstr "����一応�検査����。\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 msgid "I have checked this key very carefully.\n"
 msgstr "�������り注���検査����。\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:981
 msgid "Really sign? (y/N) "
 msgstr "本当�署�����? (y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "署��失敗����: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "���スタブ�る��カード上�項目���り��ん - パスフレーズ�変更�れ��"
 "ん。\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1152
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "� %s: パスフレーズ�変更エラー: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "save and quit"
 msgstr "�存��終了"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 msgid "show key fingerprint"
 msgstr "��フィンガープリントを表示"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "show the keygrip"
 msgstr "keygripを表示"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "��ユーザID�一覧"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "ユーザID N��択"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr "副�N��択"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr "署��確�"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "�択��ユーザID�署��る [* 以下�関連コマンドを�照 ]"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "sign selected user IDs locally"
 msgstr "�択��ユーザID�ローカル�署�"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 msgid "sign selected user IDs with a trust signature"
 msgstr "�択��ユーザID�信用署�を署��る"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "�択��ユーザID�失効���署�を�る"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "add a user ID"
 msgstr "ユーザID�追加"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "フォトID�追加"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr "�択��ユーザID�削除"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr "副�を追加"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr "スマートカード���追加"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr "�をスマートカード�移動"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr "TPM形��ローカル�TPMを使���を変��る"
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr "�ックアップ�をスマートカード�移動"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 msgid "delete selected subkeys"
 msgstr "�択��副��削除"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "失効��追加"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 msgid "delete signatures from the selected user IDs"
 msgstr "�択��ユーザID�ら署�を削除�る"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1314
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "�����択��副��有効期�を変更�る"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1316
 msgid "flag the selected user ID as primary"
 msgstr "�択��ユーザIDを主��る"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "優先指定�一覧 (エキスパート)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "優先指定�一覧 (冗長)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 msgid "set preference list for the selected user IDs"
 msgstr "�択��ユーザID�優先指定リストを設定"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1325
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "�択��ユーザID�優先�サー��URLを設定"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1327
 msgid "set a notation for the selected user IDs"
 msgstr "�択��ユーザID�注釈を設定�る"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1329
 msgid "change the passphrase"
 msgstr "パスフレーズ�変更"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "所有者信用�変更"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 msgid "revoke signatures on the selected user IDs"
 msgstr "�択��ユーザID�署�を失効"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 msgid "revoke selected user IDs"
 msgstr "�択��ユーザID�失効"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "revoke key or selected subkeys"
 msgstr "��失効����択��副��失効"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "enable key"
 msgstr "�を有効��る"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr "�を無効��る"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr "�択��フォトIDを表示"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "使���ユーザIDをコンパクト���使���署�を��ら除去"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1349
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "使���ユーザIDをコンパクト�������署�を��ら除去"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1470
 msgid "Secret key is available.\n"
 msgstr "秘密��利用����。\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 msgid "Secret subkeys are available.\n"
 msgstr "秘密副��利用����。\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1574
 msgid "Need the secret key to do this.\n"
 msgstr "��実行��秘密���り��。\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4425,284 +4435,268 @@ msgstr ""
 "  't' �始�る�信用署� (tsign)�'nr' �始�る�失効��署�\n"
 "  (nrsign)�も����れら�組���� (ltsign, tnrsign, ��)��り��。\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "���失効�れ����。"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "本当�全��テキストユーザID�署�����? (y/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1682
 msgid "Really sign all user IDs? (y/N) "
 msgstr "本当�全ユーザID�署�����? (y/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1690
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "ヒント: ��署��るユーザIDを�択���\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "('%s'コマンドを使用������。)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 msgid "You can't delete the last user ID!\n"
 msgstr "最後�ユーザID�削除����ん!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1755
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�択��全ユーザIDを本当�削除����? (y/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 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:1814 g10/keyedit.c:1854
 msgid "Really move the primary key? (y/N) "
 msgstr "��主�を本当�移動����? (y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 msgid "You must select exactly one key.\n"
 msgstr "�を���り1��択������。\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 msgid "Command expects a filename argument\n"
 msgstr "コマンド�ファイル��引数を期待���\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "'%s'�開���ん: %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "�ックアップ�を'%s'�ら読�込��る際�エラー: %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1969
 msgid "You must select at least one key.\n"
 msgstr "�を少���も1本�択������。\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1975
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�択���を本当�削除����? (y/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "���を本当�削除����? (y/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2015
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�択��全ユーザIDを本当�失効����? (y/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2016
 msgid "Really revoke this user ID? (y/N) "
 msgstr "��ユーザIDを本当�失効����? (y/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2034
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "���全体を本当�失効����? (y/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2045
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�択��副�を本当�失効����? (y/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2047
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "��副�を本当�失効����? (y/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2105
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "ユーザ�指定��信用データベースを利用中�所有者信用�設定����ん。\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2150
 msgid "Set preference list to:\n"
 msgstr "優先指定�一覧を設定:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "�択��ユーザID�優先指定を本当�更新����? (y/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2159
 msgid "Really update the preferences? (y/N) "
 msgstr "優先指定を本当�更新����? (y/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Save changes? (y/N) "
 msgstr "変更を�存����? (y/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr "�存���終了����? (y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "��無変更���更新�����。\n"
 
-#: g10/keyedit.c:2557
+#: g10/keyedit.c:2558
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "最後�有効�ユーザID�失効����ん。\n"
 
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2584
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "ユーザID�失効�失敗����: %s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "プライマリ・ユーザID�設定�失敗����: %s\n"
 
-#: g10/keyedit.c:2677
+#: g10/keyedit.c:2717
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\"�フィンガープリント���り��ん\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" �プライマリ・フィンガープリント���り��ん\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "無効�ユーザID '%s': %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "No matching user IDs."
 msgstr "マッ��るユーザID��り��ん。"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "Nothing to sign.\n"
 msgstr "署��るも���り��ん。\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "����よ��署��れ����ん。\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "��署��失効�失敗����: %s\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3251
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s'��有効�有効期����り��ん\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\"�正��フィンガープリント���り��ん\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "副�\"%s\"�見��り��ん\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr "AEAD: "
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "ダイジェスト: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "機能: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr "�サー� 修正���"
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "優先�サー�: "
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr "注釈: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x形�ユーザID�優先指定���り��ん。\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3735
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "%s�%s�%s�よ��以下����失効�れ���\n"
 
-#: g10/keyedit.c:3867
+#: g10/keyedit.c:3759
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "�����%s�%s�よ��失効�能��"
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr "(機密指定)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "作�: %s"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr "失効: %s"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr "期�切れ: %s"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "有効期�: %s"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr "利用法: %s"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr "カード番�: "
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr "信用: %s"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr "有効性: %s"
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "����使用�止�設定�れ����"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4710,17 +4704,17 @@ msgstr ""
 "プログラムを�起動�る���表示�れ���有効性�正�����も�れ���\n"
 "�����を念頭��������。\n"
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "期�切れ"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4729,17 +4723,17 @@ msgstr ""
 "*警告*: 主�るユーザID��り��ん。��コマンド��別�\n"
 "              ユーザID�主��る�仮定�る場���り��。\n"
 
-#: g10/keyedit.c:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "*警告*: ����暗�副��も���期�切れ��り��。\n"
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "��有効期�も変更�����ょ�\n"
 
-#: g10/keyedit.c:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4749,70 +4743,70 @@ msgstr ""
 "��\n"
 "        ���を拒��る�も�れ��ん。\n"
 
-#: g10/keyedit.c:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�れ�も追加������? (y/N) "
 
-#: g10/keyedit.c:4324
+#: g10/keyedit.c:4216
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2形�����フォトIDを追加����ん。\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4231
 msgid "Such a user ID already exists on this key!"
 msgstr "�����ユーザID��������存在�����!"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "��正��署�を削除����? (y/N/q)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "��無効�署�を削除����? (y/N/q)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "���明�署�を削除����? (y/N/q)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "��自己署�を本当�削除����? (y/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d個�署�を削除����。\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "何も削除�����ん。\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "無効"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ユーザID \"%s\" ��コンパクト��り���: %s\n"
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "ユーザID \"%s\": %d �署��除去�れ���\n"
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ユーザID \"%s\": 既�最�化�れ����\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ユーザID \"%s\": 既�クリーン�������\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4822,209 +4816,209 @@ msgstr ""
 "���\n"
 "        ���を拒��る�も�れ��ん。\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x形�����指�失効者を追加����ん。\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "指�失効者�ユーザIDを入力������: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x形�����指�失効者�任命����ん\n"
 
-#: g10/keyedit.c:4673
+#: g10/keyedit.c:4565
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "指�失効者������自体を任命����ん\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4587
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "����失効者���も�指��れ����\n"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4605
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "*警告*: �る�を指�失効者�設定�る��元�戻���ん!\n"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4611
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "本当����を指�失効者�任命����? (y/N) "
 
-#: g10/keyedit.c:4788
+#: g10/keyedit.c:4680
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "本当�複数�副��失効期�を変更����? (y/N) "
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 msgid "Changing expiration time for a subkey.\n"
 msgstr "副��有効期�を変更���。\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "主��有効期�を変更���。\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3��有効期��変更����ん\n"
 
-#: g10/keyedit.c:4912
+#: g10/keyedit.c:4804
 msgid "Changing usage of a subkey.\n"
 msgstr "副��使用法を変更���。\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 msgid "Changing usage of the primary key.\n"
 msgstr "主��使用法を変更���。\n"
 
-#: g10/keyedit.c:5033
+#: g10/keyedit.c:4925
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "署��る副�%s����相互証明�れ����\n"
 
-#: g10/keyedit.c:5039
+#: g10/keyedit.c:4931
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "副� %s �署�を������相互証明�必���り��ん\n"
 
-#: g10/keyedit.c:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "ユーザIDを���り����択������。\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ユーザID\"%s\"�v3自己署�をスキップ���\n"
 
-#: g10/keyedit.c:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr "優先�サー�URLを入力������: "
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "本当�置��������? (y/N) "
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "本当�削除������? (y/N) "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 msgid "Enter the notation: "
 msgstr "注釈を入力: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 msgid "Proceed? (y/N) "
 msgstr "進����? (y/N) "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d番�ユーザID��り��ん\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "�ッシュ%s�ユーザID��り��ん\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "�ID'%s'�副���り��ん\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d番�副���り��ん\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ユーザID:\"%s\"\n"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s�%s%s%s�署��れ����\n"
 
-#: g10/keyedit.c:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (エクス�ート��)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "��署��%s�期�切れ��。\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�れ�も本当�失効������? (y/N) "
 
-#: g10/keyedit.c:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "��署��対�る失効証明書を作�����? (y/N) "
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�れら�ユーザID��%s�署�����:\n"
 
-#: g10/keyedit.c:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr " (失効��)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "�����%s�%s�失効�れ����\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "�れら�署�を失効�よ�������:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "失効証明書を本当�作�����? (y/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "秘密���り��ん\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "ユーザID���も�を失効�よ������: %s\n"
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ユーザID\"%s\"��も�失効�れ����\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "*警告*: ユーザID署���%d秒未���\n"
 
-#: g10/keyedit.c:6426
+#: g10/keyedit.c:6320
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "最後�有効�ユーザID�失効����ん。\n"
 
-#: g10/keyedit.c:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "� %s ��も�失効�れ����。\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "副� %s ��も�失効�れ����。\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (大��%ld) ��%s (uid %d) �フォトID���表示\n"
@@ -5064,33 +5058,33 @@ msgstr "AEAD方��優先指定�多����\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "優先指定�文字列�無効�項目'%s'��り��\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "直接署�を書�込���\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "自己署�を書�込���\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "�対応��署�を書�込���\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "無効��長。%uビット����\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�長を%uビット�丸���\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5098,19 +5092,19 @@ msgstr ""
 "*警告*: �����OpenPGPプログラム���ダイジェスト長�DSA�を扱�����"
 "���ん\n"
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr "Sign"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr "Certify"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr "Encrypt"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr "Authenticate"
 
@@ -5124,166 +5118,166 @@ msgstr "Authenticate"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "��%s���り�る�作: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr "�在���られ��作: "
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 署�機能を�転�る\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 暗�機能を�転�る\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) �証機能を�転�る\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 完了\n"
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA � RSA%s\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA � Elgamal%s\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, c-format
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (署���)%s\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2113
 #, c-format
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (署���)%s\n"
 
-#: g10/keygen.c:2142
+#: g10/keygen.c:2119
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (暗�化��)%s\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, c-format
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (暗�化��)%s\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2127
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (機能を���自身�設定)%s\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (機能を���自身�設定)%s\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ECC (署��暗�化)%s\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 msgid " *default*"
 msgstr " *デフォルト"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (署���)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) ECC (機能を���自身�設定)%s\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, c-format
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC (暗�化��)%s\n"
 
-#: g10/keygen.c:2167
+#: g10/keygen.c:2144
 #, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) 既存��%s\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "  (%d) カード�存在�る�%s\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "keygripを入力: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "��keygrip����り��ん\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "カード�シリアル番�: %s\n"
 
-#: g10/keygen.c:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "利用�能��:\n"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "%uビット�切り上���\n"
 
-#: g10/keygen.c:2570
+#: g10/keygen.c:2547
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s �� %u �ら %u ビット�長���能��。\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2555
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "副���長�? (%u) "
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�求�れ��長�%uビット\n"
 
-#: g10/keygen.c:2641
+#: g10/keygen.c:2618
 msgid "Please select which elliptic curve you want:\n"
 msgstr "�希望�楕円曲線を�択������:\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5299,7 +5293,7 @@ msgstr ""
 "      <n>m = �� n �月間�期�切れ\n"
 "      <n>y = �� n 年間�期�切れ\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5315,38 +5309,38 @@ msgstr ""
 "      <n>m = 署�� n �月間�期�切れ\n"
 "      <n>y = 署�� n 年間�期�切れ\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "��有効期間�? (0)"
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "署��有効期間�? (%s)"
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "無効�値\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr "��無期���\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr "署��無期���\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "��%s�期�切れ��り��\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "署��%s�期�切れ��り��\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5354,11 +5348,11 @@ msgstr ""
 "��システム���2038年以��日付を表示�る�������ん��\n"
 "2106年��正��処��れ��。\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr "�れ�正�����? (y/N) "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5372,7 +5366,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5388,41 +5382,41 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "本�: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "���無効�文字��り��\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "キャラクタ'%s'�'%s'����使���ん\n"
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "電�メール・アドレス: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "有効�電�メール・アドレス���り��ん\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "コメント: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "コメント�無効�文字��り��\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "����文字集�'%s'を使�����。\n"
 
-#: g10/keygen.c:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5433,11 +5427,11 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "電�メール�アドレスを本�やコメント�入れ��よ��\n"
 
-#: g10/keygen.c:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr "�����ユーザID��������存在�����!\n"
 
@@ -5452,31 +5446,31 @@ msgstr "�����ユーザID��������存在�����!
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "��(N)�コメント(C)�電�メール(E)�変更����終了(Q)? "
 
-#: g10/keygen.c:3142
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "��(N)�コメント(C)�電�メール(E)�変更����OK(O)�終了(Q)? "
 
-#: g10/keygen.c:3147
+#: g10/keygen.c:3124
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "��(N)�電�メール(E)�変更����終了(Q)? "
 
-#: g10/keygen.c:3148
+#: g10/keygen.c:3125
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "��(N)�電�メール(E)�変更����OK(O)�終了(Q)? "
 
-#: g10/keygen.c:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "��エラーを修正������\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5487,18 +5481,18 @@ msgstr ""
 "��ディスク�アクセス�る���他��作を素数生��間�行�����乱数生\n"
 "�器��分�エントロピーを供給�る機会を与�る�������。\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr "警告: v4 �指定�れ���� v5 �上書��れ��。\n"
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "��生��失敗����: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5509,64 +5503,64 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr "続����? (Y/n) "
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "\"%s\" ���も��り��\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 msgid "Create anyway? (y/N) "
 msgstr "�れ�も�を作�����? (y/N) "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, c-format
 msgid "creating anyway\n"
 msgstr "��れ����を作�\n"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "注�: 全機能��生��� \"%s %s\" を使���。\n"
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "��生���り消�れ���。\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "�ックアップ・ファイル'%s'�作�����ん: %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "注�: カード���ックアップ�'%s'��存�れ��\n"
 
-#: g10/keygen.c:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "'%s'�公開�を書�込���\n"
 
-#: g10/keygen.c:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "書�込��能�公開�リング�見��り��ん: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "公開�リング'%s'�書�込�エラー: %s\n"
 
-#: g10/keygen.c:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "公開��秘密�を作���署�����。\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 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"
@@ -5574,34 +5568,34 @@ msgstr ""
 "����暗�化��使用�������注�������。暗�化を行����\n"
 "\"--edit-key\"コマンドを使��副�を生�������。\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "��%lu秒未������� (時間歪曲�時計�障害��ょ�)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "��%lu秒未������� (時間歪曲�時計�障害��ょ�)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注�: v3��対�る副��作���OpenPGP������ん\n"
 
-#: g10/keygen.c:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主��秘密部分�利用����ん。\n"
 
-#: g10/keygen.c:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主��秘密部分�カード上��存�れ����。\n"
 
-#: g10/keygen.c:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr "本当�作�����? (y/N) "
 
@@ -5609,71 +5603,87 @@ msgstr "本当�作�����? (y/N) "
 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"
 msgstr[0] "正��署�%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"
 msgstr[0] "エラー���%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"
 msgstr[0] "警告: %lu個�����大�����スキップ�れ���\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "�リング"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr " 主�フィンガープリント:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr "  主�フィンガープリント:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "  副�フィンガープリント:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr "   フィンガープリント ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr "   カードシリアル番� ="
 
@@ -6036,7 +6046,7 @@ msgstr "�イナリ"
 msgid "textmode"
 msgstr "テキストモード"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "�明�"
 
@@ -6175,27 +6185,27 @@ msgstr "無圧縮"
 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:1614
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "�����オプション'%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "�明�オプション'%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "�明�弱�ダイジェスト'%s'\n"
@@ -6310,7 +6320,7 @@ msgstr ""
 "作�日付 %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6324,70 +6334,70 @@ msgstr ""
 "������ょ�。も�大��写真を使��������も�様�大���り\n"
 "��! 240x288�ら�����る大���画���使�よ���ょ�。\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "フォトID用�JPEGファイル�を入力������: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "JPEGファイル'%s'�開���ん: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:239
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "��JPEG��本当�大�� (%d�イト) !\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:241
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "本当�使������? (y/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:257
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "'%s'��JPEGファイル���り��ん\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "��写真�正����� (y/N/q)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "�隔プログラム�実行��サ�ート�����ん\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:593
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "��プラットホーム���外部プログラム�呼出����一時ファイル�必���\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "外部プログラム���自然�終了\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "外部プログラム�呼出��システム・エラー: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:707
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "*警告*: 一時ファイルを削除����ん (%s) '%s': %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:711
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "*警告*: 一時ディレクトリ'%s'を削除����ん: %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6395,7 +6405,7 @@ msgstr ""
 "オプション・ファイル�許�モード�安全�������外部プログラム�呼出��"
 "�止��り��。\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "フォトID�表示�能!\n"
@@ -6703,12 +6713,12 @@ msgstr "デフォルト���人\"%s\"��明��\n"
 msgid "no valid addressees\n"
 msgstr "有効�宛先��り��ん\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "注�: �%s�� %s �機能��り��ん\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "注�: �%s��%s�対�る優先指定��り��ん\n"
@@ -7711,7 +7721,7 @@ msgstr "%s信用モデルを使用\n"
 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"
@@ -7741,35 +7751,35 @@ msgstr "--check-trustdbを実行������\n"
 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"
 msgstr[0] "%d個��を処�"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " (��%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 ""
@@ -7894,7 +7904,7 @@ msgstr ""
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -7902,7 +7912,7 @@ msgstr "%s番�: %s%%0A��者: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -7932,7 +7942,7 @@ msgstr "|N|��ら��アンブロッキングキーを入力�����
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "||����PIVカード�アンブロッキングキーを入力������"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8016,70 +8026,70 @@ msgstr[0] "��生��完了���� (%d秒)\n"
 msgid "response does not contain the public key data\n"
 msgstr "応答�公開�データ���れ����ん\n"
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|管�者PINを入力������"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||PINを標準������入力������。"
 
-#: scd/app-nks.c:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA�モジュラス�����%dビット�も����り��ん\n"
 
-#: scd/app-nks.c:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA公開指数���� %d ビットより大�����\n"
 
-#: scd/app-nks.c:1654
+#: scd/app-nks.c:1656
 msgid "Note: PIN has not yet been enabled."
 msgstr "注�: PIN���有効�������ん"
 
-#: scd/app-nks.c:1701
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN�変更�れ����ん\n"
 
-#: scd/app-nks.c:2074
+#: scd/app-nks.c:2088
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|新��PINを標準������入力������。"
 
-#: scd/app-nks.c:2082
+#: 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:2092
+#: 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:2102
+#: 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:2104
+#: 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:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "新��PIN��得エラー: %s\n"
@@ -8336,13 +8346,13 @@ msgstr "fd %d��ンドラ�開始�れ���\n"
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d��ンドラ�終了����\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 "Tor�使�れ��る�も�れ��ん - �ットワークアクセス�制��れ��"
 
@@ -8351,11 +8361,11 @@ msgstr "Tor�使�れ��る�も�れ��ん - �ットワークアク
 msgid "validation model requested by certificate: %s"
 msgstr "証明書�ら以下�検証モデル��求�れ���: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:199 sm/certchain.c:2211
 msgid "chain"
 msgstr "chain"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 msgid "shell"
 msgstr "shell"
 
@@ -8378,237 +8388,237 @@ msgstr "コンフィグ�れ��リシー���クリティカル�マー
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "フィンガープリント��得�失敗����\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "発行者�外部ロケーションを調�����\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "マッ��る発行者�数: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "authorityInfoAccessを�得����ん: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:793
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "Dirmngrキャッシュ�ら発行者を調�����\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:818
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "マッ��る証明書�数: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "keyDB�ンドル�確��失敗����\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1260 sm/certchain.c:1264
 msgid "certificate has been revoked"
 msgstr "証明書�失効済���"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr "証明書�ステイタス��明��"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "\"dirmngr\" �正��インストール�れ��る��を確�������\n"
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr "証明書���有効���り��ん"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 msgid "root certificate not yet valid"
 msgstr "ルート証明書���有効���り��ん"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr "中間証明書���有効���り��ん"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr "証明書�有効期�を������"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 msgid "root certificate has expired"
 msgstr "ルート証明書�有効期�を������"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 msgid "intermediate certificate has expired"
 msgstr "中間証明書�有効期�を������"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "必��証明書�属性��り��ん: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1404
 msgid "certificate with invalid validity"
 msgstr "妥当性�無効�証明書"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr "証明書�ライフタイム�間�署��作られ����ん"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr "発行者�ライフタイム�間�証明書�作られ����ん"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "発行者�ライフタイム�間�中間証明書�作られ����ん"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  署��作�"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, c-format
 msgid "  (certificate created at "
 msgstr "   (証明書�作�"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (     証明書�有効"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     発行者�有効"
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "フィンガープリント=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "ルート証明書�信用�る�今�マーク�れ���\n"
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1505
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 "インタラクティブ�信用�る�マーク�る���gpg-agent�有効�������ん\n"
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1511
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 "インタラクティブ�信用�る�マーク�る�����セッション��無効�����"
 "��\n"
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "*警告*: 署��作�時間��明�� - �在時刻を仮定���"
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 msgid "no issuer found in certificate"
 msgstr "証明書�発行者��り��ん"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 msgid "self-signed certificate has a BAD signature"
 msgstr "自己署�証明書�*�正�*署���り��"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "ルート証明書�信用��る�マーク�れ����ん"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "信用リスト�検査�失敗����: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "証明書��ェイン�長����\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr "発行者証明書�見��り��ん"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "証明書�*�正�*署���り��"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1911 dirmngr/validate.c:693
 msgid "found another possible matching CA certificate - trying again"
 msgstr "別�一致�る�能性��るCA証明書�見��り��� - �度試���"
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr "証明書�正����\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "中間証明書�正����\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, c-format
 msgid "root certificate is good\n"
 msgstr "ルート証明書�正����\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr "�ェイン・モデル�切り替����"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr "使用��検証モデル: %s"
@@ -8631,7 +8641,7 @@ msgstr "メモリ��り��ん\n"
 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:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "none"
 
@@ -8666,42 +8676,42 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "作� %s, 有効期� %s.\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "��使�方�指定�れ����ん - ����使��を仮定���\n"
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "証明書�証明����使�れる�����り��ん���\n"
 
-#: sm/certlist.c:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "証明書�OCSP応答�署�����使�れる�����り��ん���\n"
 
-#: sm/certlist.c:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "証明書�暗�化����使�れる�����り��ん���\n"
 
-#: sm/certlist.c:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "証明書�署�����使�れる�����り��ん���\n"
 
-#: sm/certlist.c:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "証明書�暗�化����使���ん\n"
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "証明書�署�����使���ん\n"
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "別�証明書を探�\n"
@@ -9253,7 +9263,7 @@ msgstr "署�者 %d����使�れ��ッシュアルゴリズム: %s (
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "�正��定証明書�検査�失敗����: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "%s/%s 署� (%s�ID %sを使用)\n"
@@ -9443,7 +9453,7 @@ msgstr "キャッシュ・ファイル' %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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "キャッシュ・ファイル�クローズ�エラー: %s\n"
@@ -9690,134 +9700,134 @@ msgstr "�明��ッシュ・アルゴリズム'%s'\n"
 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:1849 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "S��作��失敗����: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1923
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse �失敗����: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1938
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "CRL�更新時刻��得エラー: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1945
 #, 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:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nextUpdate�与�られ����ん。一日�有効期間を仮定���\n"
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "CRL項目��得エラー: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1984
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "一時キャッシュ・ファイル�項目�挿入エラー: %s\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2011
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "CRL�発行者��り��ん: %s\n"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "CRL発行証明書をauthorityKeyIdentifier�見����\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL署��検証�失敗����: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2084
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "CRL発行者証明書�検証検査エラ−: %s\n"
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2226
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new �失敗����: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2233
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader �失敗����: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2267
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "��一時キャッシュ・ファイル'%s'を削除����\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2271
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "��一時キャッシュ・ファイル'%s'�削除��題: %s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "一時キャッシュ・ファイル'%s'�作�エラー: %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2291
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert �失敗����: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "一時キャッシュ・ファイル'%s'�終了エラー: %s\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2308
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "一時キャッシュ・ファイル'%s'�クローズ・エラー: %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2333
 #, 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:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "新��CRL��������。%s�期�������\n"
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "�明�クリティカルCRL�拡張 %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "CRL拡張�読�込�エラー: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2414
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "キャッシュ・ファイル'%s'�作�\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "'%s'�ら'%s'���変更��題: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2460
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -9826,65 +9836,65 @@ msgstr ""
 "DIRファイル�更新�失敗 - キャッシュ・エントリ�次�プログラム�開始�失�れ"
 "��\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "CRLダンプ�開始 (%s �ら�得)\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 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:2523
 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:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr "*エラー*: CRL�使用�れ��ん\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr "*エラー*: ��キャッシュ�れ�CRL�変更�れ��る�も�れ��ん!\n"
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr "*警告*: 無効�キャッシュ・レコード長\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2558
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "キャッシュ・レコード�読�込���題: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2569
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "キャッシュ���読�込���題: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2600
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "db�らキャッシュ・エントリ�読�込�エラー: %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2603
 msgid "End CRL dump\n"
 msgstr "CRLダンプ�終了\n"
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "DP�らcrl_fetch�失敗����: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "DP�らcrl_cache_insert�失敗����: %s\n"
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "発行者�らcrl_cache_insert�失敗����: %s\n"
@@ -10225,12 +10235,12 @@ msgstr "使�方: %s [オプション] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "コロン�ソケット��許�れ��ん\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "'%s'�らCRL��得�失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "'%s'�らCRL�処��失敗: %s\n"
@@ -10474,91 +10484,91 @@ msgstr "'%s'�対�るOCSP応答��ッシング�失敗����: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "デフォルトOCSP署�者�証明�署��れ����ん"
 
-#: dirmngr/ocsp.c:582
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "リスト項目�確��失敗����: %s\n"
 
-#: dirmngr/ocsp.c:598 dirmngr/ocsp.c:782
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "応答ID��得エラー: %s\n"
 
-#: dirmngr/ocsp.c:642
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "OCSP応答を検証�る�切�証明書��り��ん���\n"
 
-#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "発行者証明書�見��り��ん: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "呼出��対象�証明書を返���ん���\n"
 
-#: dirmngr/ocsp.c:698
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "呼出��発行�れる証明書を返���ん���\n"
 
-#: dirmngr/ocsp.c:708
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "OCSPコンテクスト�確��失敗����: %s\n"
 
-#: dirmngr/ocsp.c:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "デフォルトOCSPレス�ンダ�定義�れ����ん\n"
 
-#: dirmngr/ocsp.c:753
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "デフォルト�OCSP署�者�定義�れ����ん\n"
 
-#: dirmngr/ocsp.c:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "デフォルトOCSP応答'%s'を使���\n"
 
-#: dirmngr/ocsp.c:765
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "OCSP応答'%s'を使���\n"
 
-#: dirmngr/ocsp.c:822
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "対象�証明書�OCSPステイタス��得エラー: %s\n"
 
-#: dirmngr/ocsp.c:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "証明書ステイタス�: %s (�れ=%s 次=%s)\n"
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "良好"
 
-#: dirmngr/ocsp.c:854
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "証明書�失効済���: %s (�由: %s)\n"
 
-#: dirmngr/ocsp.c:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OSCPレス�ンダ�未��ステイタスを返����\n"
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OSCPレス�ンダ��在���ステイタスを返����\n"
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OSCPレス�ンダ����るステイタスを返����\n"
@@ -10572,63 +10582,63 @@ msgstr "assuan_inquire(%s)�失敗����: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire�失敗����: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "データ�信エラー: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch �失敗����: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1776
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert �失敗����: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d を越����\n"
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "制御構造を確�����ん: %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "assuanコンテクスト�確��失敗����: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "サー���期化�失敗����: %s\n"
 
-#: dirmngr/server.c:3062
+#: dirmngr/server.c:3078
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "Assuan�登録コマンド�失敗����: %s\n"
 
-#: dirmngr/server.c:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan accept ��題: %s\n"
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan�処��失敗����: %s\n"
@@ -10933,34 +10943,34 @@ msgstr ""
 "形�: gpg-check-pattern [オプション] パターンファイル\n"
 "パターンファイル�対��標準入力�パスフレーズを確��る\n"
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: tools/gpg-card.c:2428
 #, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "注�: ��も�カード��管���り��!\n"
 
-#: tools/gpg-card.c:2427
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr "既存�� %s を置������? (y/N) "
 
-#: tools/gpg-card.c:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: 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:3437 tools/gpg-card.c:3451
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -10969,47 +10979,56 @@ msgstr ""
 "警告: ユーザインタラクションフラグを\"%s\"�戻���\n"
 "      ファクトリリセット���り��ん!\n"
 
-#: tools/gpg-card.c:3454
+#: 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:3700
+#: tools/gpg-card.c:3758
 msgid "authenticate to the card"
 msgstr "カード�対���証���"
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr "カードデーモン�リセットを�信�る"
 
-#: tools/gpg-card.c:3704
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "PIN�証�KDFを設定�る"
 
-#: tools/gpg-card.c:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr "プライベート使用�データオブジェクトを変更�る"
 
-#: tools/gpg-card.c:3707
+#: tools/gpg-card.c:3765
 msgid "read a certificate from a data object"
 msgstr "データオブジェクト�ら証明書を読�出���"
 
-#: tools/gpg-card.c:3708
+#: tools/gpg-card.c:3766
 msgid "store a certificate to a data object"
 msgstr "証明書をデータオブジェクト��管���"
 
-#: tools/gpg-card.c:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr "プライベート�をデータオブジェクト��管�る"
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr "Yubikey管�コマンド"
 
-#: tools/gpg-card.c:3712
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr "コマンド履歴を管��る"
 
+#~ 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"
 
diff --git a/po/nb.gmo b/po/nb.gmo
index e997950..31be458 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index 58378ca..c7a6eaf 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2017-11-02 17:40+0100\n"
 "Last-Translator: Ã…ka Sikrom <a4@hush.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -153,8 +153,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Passordfrase:"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "feil. Prøv igjen"
 
@@ -203,17 +203,17 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "feil under henting av kort-serienummer: %s\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Skriv inn denne passordfrasen på nytt"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -224,7 +224,7 @@ msgid ""
 msgstr ""
 "Skriv inn passordfrase for å låse nytt importert objekt i GnuPG-systemet."
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -235,25 +235,25 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "klarte ikke å åpne «%s»: %s\n"
@@ -263,12 +263,12 @@ msgstr "klarte ikke å åpne «%s»: %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "fant ingen passende kortnøkkel: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "feil under henting av kortliste: %s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -277,20 +277,20 @@ msgstr ""
 "En ssh-prosess ber om tillatelse til å brukt nøkkel%%0A  %s%%0A  (%s)%%0AVil "
 "du tillate dette?"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Tillat"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Avvis"
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -299,7 +299,7 @@ msgstr ""
 "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:3797
+#: agent/command-ssh.c:3837
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "klarte ikke å lage strøm av sokkel: %s\n"
@@ -424,214 +424,220 @@ msgstr "Skriv inn passordfrase for å%0Abeskytte ny nøkkel"
 msgid "Please enter the new passphrase"
 msgstr "Skriv inn ny passordfrase"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Nyttige feilsøkingsvalg"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr "kjør som bakgrunnsprosess («daemon»)"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr "kjør i tjenermodus (forgrunn)"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "ikke løsne fra konsoll"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr "sh-utdata for kommandoer"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr "csh-utdata for kommandoer"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|les valg fra valgt FIL"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr "Styring av diagnostikk-utdata"
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "detaljert utskrift"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "være noenlunde stille"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FIL|skriv tjenermodus-logger til valgt FIL"
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr "Oppsettsvalg"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 msgid "do not use the SCdaemon"
 msgstr "ikke bruk SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|bruk PGN som SCdaemon-program"
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 #, 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:215
+#: agent/gpg-agent.c:216
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|godta enkelte kommandoer via «NAME»"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr "ignorer forespørsler om å bytte TTY"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr "ignorer forespørsler om å bytte X-skjerm"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 msgid "enable ssh support"
 msgstr "slå på ssh-støtte"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|bruk valgt ALGOritme til å vise ssh-fingeravtrykk"
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 msgid "enable putty support"
 msgstr "slå på støtte for putty"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "slå på støtte for putty"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "Sikkerhetsvalg"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|fjern hurtiglagrede PIN-koder etter N sekunder"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|SSH-nøkler utgår etter N antall sekunder"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 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:248
+#: agent/gpg-agent.c:256
 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:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr "ikke bruk PIN-hurtiglager under signering"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 msgid "disallow the use of an external password cache"
 msgstr "ikke tillat bruk av eksternt passord-hurtiglager"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "ikke la klienter tillitsmarkere nøkler"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 msgid "allow presetting passphrase"
 msgstr "tillat valg av passordfrase på forhånd"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr "Valg som håndhever passordfrase-regler"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr "ikke tillat avvik fra passordregler"
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|endre minimal passordfrase-lengde til N"
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 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:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FIL|kontroller nye passordfraser mot mønster i valgt FIL"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|regn passord som ugyldig etter N antall dager"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 msgid "do not allow the reuse of old passphrases"
 msgstr "ikke tillat gjenbruk av gamle passordfraser"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Sikkerhetsvalg"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr "ikke la kaller overstyre PIN-inntasting"
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 #, 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:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|bruk PGM til inntasting av PIN-koder"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|endre tidsavbrudd for PIN-inntasting til N antall sekunder"
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: 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:570
+#: agent/gpg-agent.c:582
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Bruk: @GPG_AGENT@ [valg] («-h» for hjelp)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -639,135 +645,135 @@ msgstr ""
 "Syntaks: @GPG_AGENT@ [valg] [kommando [arg]]\n"
 "Håndtering av hemmelige nøkler for @GNUPG@\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "«%s» er et ugyldig feilsøkingsnivå\n"
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg kontrollsum-algoritme er ugyldig\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "leser valg fra «%s»\n"
 
-#: agent/gpg-agent.c:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: valget «%s» er utgått\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "klarte ikke å lage sokkel: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "sokkelnavnet «%s» er for langt\n"
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "feil under henting av sokkel-anledning\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "feil under knytning av sokkel til «%s»: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "klarte ikke å endre tillatelser til «%s»: %s\n"
 
-#: agent/gpg-agent.c:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "lytter på sokkel «%s»\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "klarte ikke å lage mappa «%s»: %s\n"
 
-#: agent/gpg-agent.c:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "mappa «%s» er opprettet\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() mislyktes for «%s»: %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "«%s» kan ikke brukes som hjemmemappe\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, 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:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "startet behandler 0x%lx for fd %d\n"
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "avsluttet behandler 0x%lx for fd %d\n"
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, 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:2853
+#: agent/gpg-agent.c:2967
 #, 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:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect mislyktes: %s - venter 1s\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppet\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1039,7 +1045,7 @@ msgstr "kontroll av opprettet signatur mislyktes: %s\n"
 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:1602
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "offentlig nøkkelalgoritme %d (%s) støttes ikke\n"
@@ -1054,53 +1060,53 @@ msgstr "beskyttelsesalgoritme %d (%s) støttes ikke\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1130,18 +1136,18 @@ msgstr "Advarsel: utrygt eierskap til %s «%s»\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Advarsel: utrygge tillatelser til %s «%s»\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "venter på at fila «%s» skal bli tilgjengelig …\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "klarte ikke å gi «%s» det nye navnet «%s»: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "ja"
 
@@ -1195,8 +1201,8 @@ msgstr "kjernen i sikkert minne ble full under tildeling av %lu byte"
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1216,73 +1222,73 @@ msgstr "ADVARSEL: valget «%s%s» er utgått, og har ingen effekt\n"
 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:432 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"
@@ -1430,11 +1436,11 @@ msgstr "Sertifikatkjede gyldig"
 msgid "Root certificate trustworthy"
 msgstr "Rotsertifikat regnes som troverdig"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 msgid "no CRL found for certificate"
 msgstr "fant ingen sertifikat-CRL"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 msgid "the available CRL is too old"
 msgstr "tilgjengelig CRL er for gammel"
 
@@ -1471,7 +1477,7 @@ msgstr "Ingen hjelp tilgjengelig for «%s»"
 msgid "ignoring garbage line"
 msgstr "ignorerer ubrukelig linje"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "[none]"
 msgstr "[ingen]"
 
@@ -1515,36 +1521,36 @@ msgstr "iconv_open mislyktes: %s\n"
 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
 #, 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"
@@ -1554,92 +1560,92 @@ msgstr "venter på lås %s …\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s er for gammel (krever %s, har %s)\n"
 
-#: g10/armor.c:441
+#: 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"
@@ -1647,12 +1653,12 @@ msgstr ""
 "anført utskrivbart tegn i armor. Noen har antakeligvis brukt en feiloppsatt "
 "e-posttjener\n"
 
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, c-format
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "[ ikke menneskevennlig (%zu byte: %s%s) ]"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1661,32 +1667,32 @@ msgstr ""
 "notatnavn kan bare inneholde utskrivbare tegn og mellomrom, og må slutte med "
 "«=»\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "bruker-notatnavn må inneholde tegnet «@»\n"
 
-#: g10/build-packet.c:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "notatverdier kan ikke inneholde kontrolltegn\n"
 
-#: g10/build-packet.c:1606
+#: g10/build-packet.c:1624
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "notatnavn kan ikke inneholde tegnet «=»\n"
 
-#: g10/build-packet.c:1612
+#: g10/build-packet.c:1630
 #, 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:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "ADVARSEL: fant ugyldig notatdata\n"
@@ -1700,7 +1706,7 @@ msgstr "klarte ikke å videresende %s forespørsel til klient\n"
 msgid "Enter passphrase: "
 msgstr "Skriv inn passordfrase: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 g10/sign.c:473
 #: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
@@ -1718,7 +1724,7 @@ msgstr "feil under lesing fra %s: %s\n"
 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:2330
+#: 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"
@@ -1763,170 +1769,170 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "lag opphevelsessertifikat"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "tvunget"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 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:1500
+#: g10/card-util.c:803 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:1502
+#: g10/card-util.c:805 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:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Kortholders etternavn: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Kortholders fornavn: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Logindata (kontonavn): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Språkoppsett: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Feil: ugyldig svar.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtrykk: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 msgid "not an OpenPGP card"
 msgstr "ikke et OpenPGP-kort"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr "Erstatte eksisterende nøkkel? (j/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 tools/gpg-card.c:3363
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1942,109 +1948,109 @@ msgstr ""
 "      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:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) Signaturnøkkel\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Krypteringsnøkkel\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Autentiseringsnøkkel\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Ugyldig valg.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 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:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2055,186 +2061,186 @@ msgstr ""
 "   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:1741
 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:1743 g10/card-util.c:1833
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signaturnøkkel\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1744 g10/card-util.c:1835
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnøkkel\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsnøkkel\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 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:1876
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD mislyktes: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 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:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "gå ut av denne menyen"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr "vis admin-kommandoer"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "vis denne hjelpeteksten"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "vis alle tilgjengelige data"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "endre kortholders navn"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 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:3689
+#: g10/card-util.c:2262 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:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "endre brukernavn"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "endre språkoppsett"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 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:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "endre CA-fingeravtrykk"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 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:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "lag nye nøkler"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 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:3698
+#: g10/card-util.c:2271 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:3699
+#: g10/card-util.c:2272 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:3703
+#: g10/card-util.c:2273 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:2275
 #, 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:2276
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "endre eiertillit"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/kort> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 msgid "Admin-only command\n"
 msgstr "Admin-reservert kommando\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr "Admin-kommandoer er tillatt\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "«--output» virker ikke med denne kommandoen\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2293,9 +2299,9 @@ msgstr "nøkkel"
 msgid "subkey"
 msgstr "undernøkkel"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
@@ -2328,19 +2334,19 @@ msgstr ""
 "ADVARSEL: tvungen bruk av symmetrisk krypt.metode %s (%d) bryter med "
 "mottakers oppsett\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, 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"
@@ -2350,44 +2356,45 @@ msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
 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:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "feil under opprettelse av passordfrase: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "bruker krypteringsmetode %s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "«%s» er allerede komprimert\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "ADVARSEL: «%s» er en tom fil\n"
 
-#: g10/encrypt.c:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, 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:862
+#: g10/encrypt.c:853
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "leser fra «%s»\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2396,13 +2403,13 @@ msgstr ""
 "ADVARSEL: tvungen bruk av komprimeringsalgoritme %s (%d) bryter med "
 "mottakers oppsett\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "du kan ikke bruke valget «%s» i %s-modus\n"
@@ -2431,61 +2438,73 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: ingenting eksportert\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2549,7 +2568,7 @@ msgstr "Ugyldig nøkkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
 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:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "følgende verdier er gyldige for «%s»:\n"
@@ -2622,113 +2641,113 @@ msgstr "opphev bruker-ID raskt"
 msgid "quickly set a new expiration date"
 msgstr "endre utløpsdato raskt"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr "fullverdig generering av nøkkelpar"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "lag opphevelsessertifikat"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "fjern nøkler fra offentlig nøkkelknippe"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "fjern nøkler fra hemmelig nøkkelknippe"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "quickly sign a key"
 msgstr "hurtigsigner nøkkel"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 msgid "quickly sign a key locally"
 msgstr "hurtigsigner nøkkel lokalt"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, fuzzy
 #| msgid "quickly revoke a user-id"
 msgid "quickly revoke a key signature"
 msgstr "opphev bruker-ID raskt"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "signer nøkkel"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "signer nøkkel lokalt"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "signer eller rediger nøkkel"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "endre passordfrase"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "eksporter nøkler"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "eksporter nøkler til nøkkeltjener"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "importer nøkler fra nøkkeltjener"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "søk etter nøkler på nøkkeltjener"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "oppdater alle nøkler fra nøkkeltjener"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "importer/slå sammen nøkler"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr "vis kortstatus"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr "endre data på kort"
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr "endre PIN på kort"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "oppdater tillitsdatabase"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 msgid "print message digests"
 msgstr "skriv ut kontrollsum av melding"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "kjør i tjenermodus"
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VERDI|endre TOFU-regler for nøkkel"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAVN|bruk valgt NAVN som forvalgt hemmelig nøkkel"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAVN|krypter også til valgt bruker-id-NAVN"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr "|SPES|sett opp e-post-alias"
 
@@ -2744,61 +2763,61 @@ msgstr "ikke utfør valgte endringer"
 msgid "prompt before overwriting"
 msgstr "spør før overskriving"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Sikkerhetsvalg"
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Styring av diagnostikk-utdata"
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "lag ASCII-beskyttet utdata"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|skriv utdata til valgt FIL"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "bruk kanonisk tekstmodus"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|endre komprimeringsnivå til N (0 for å slå av)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 #, 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:773
+#: g10/gpg.c:772
 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:776
+#: g10/gpg.c:775
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importer nøkler fra nøkkeltjener"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "vis og kontroller nøkkelsignaturer"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "slå av all tilgang til dirmngr"
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2826,7 +2845,7 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2834,7 +2853,7 @@ msgstr ""
 "@\n"
 "(Se bruksanvisning for en fullstendig liste over alle kommandoer og valg)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2854,11 +2873,11 @@ msgstr ""
 " --list-keys [navn]         vis nøkler\n"
 " --fingerprint [navn]       vis fingeravtrykk\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Bruk: @GPG@ [valg] [filer] (-h for hjelp)"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1172
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2868,7 +2887,7 @@ msgstr ""
 "Signer, kontroller, krypter eller dekrypter.\n"
 "Forvalgt handling avhenger av inndata.\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2876,562 +2895,550 @@ msgstr ""
 "\n"
 "Støttede algoritmer:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Off. nøkkel: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Kryptering: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "bruk: %s [valg] %s\n"
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "fant ingen «=»-tegn i gruppedefinisjon «%s»\n"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1698
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "ADVARSEL: utrygt eierskap til hjemmemappe «%s»\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "ADVARSEL: utrygt eierskap til oppsettsfil «%s»\n"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "ADVARSEL: utrygt eierskap til utvidelse «%s»\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til hjemmemappe «%s»\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til oppsettsfil «%s»\n"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til utvidelse «%s»\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, 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:1735
+#: g10/gpg.c:1725
 #, 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:1738
+#: g10/gpg.c:1728
 #, 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:1744
+#: g10/gpg.c:1734
 #, 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:1747
+#: g10/gpg.c:1737
 #, 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:1750
+#: g10/gpg.c:1740
 #, 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:1966
+#: g10/gpg.c:1956
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "oppsettselementet «%s» er ukjent\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr "vis foto-id-er i nøkkelvisning"
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 msgid "show key usage information during key listings"
 msgstr "vis informasjon om nøkkelbruk i nøkkelvisning"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr "vis regeladresser i signaturvisning"
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 msgid "show all notations during signature listings"
 msgstr "vis alle notater i signaturvisning"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr "vis IETF-standardnotater under signaturvisning"
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr "vis brukervalgte notater under signaturvisning"
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "vis foretrukne nøkkeltjener-adresser under signaturvisning"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr "vis gyldighet for bruker-ID under nøkkelvisning"
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 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:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr "vis opphevede og utgåtte undernøkler i nøkkelvisning"
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 msgid "show the keyring name in key listings"
 msgstr "vis nøkkelknippe-navn i nøkkelvisning"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 msgid "show expiration dates during signature listings"
 msgstr "vis utløpsdatoer i nøkkelvisning"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "vis innstillinger (avansert)"
+
+#: g10/gpg.c:2197
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "«%s» er et ukjent TOFU-regelverk\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(bruk «help» for å vise valg)\n"
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Merk: %s er ikke ment for vanlig bruk.\n"
 
-#: g10/gpg.c:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "«%s» er en ugyldig signatur-utløpstid\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "«%s» er en ugyldig e-postadresse\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "PIN-inntastingsmodus «%s» er ugyldig\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, 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:3315
+#: g10/gpg.c:3286
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "«%s» er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "klarte ikke å tolke nøkkeltjener-adresse\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige nøkkeltjener-valg\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "ugyldige nøkkeltjener-valg\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importeringsvalg\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "ugyldige importeringsvalg\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "filtervalget %s er ugyldig\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksporteringsvalg\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "ugyldige eksporteringsvalg\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr "vis bruker-ID under signaturbekreftelse"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr "vis adresser til retningslinjer under signaturbekreftelse"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 msgid "show all notations during signature verification"
 msgstr "vis alle merknader under signaturbekreftelse"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr "vis IETF-standardnotater under signaturbekreftelse"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr "vis selvvalgte merknader under signaturbekreftelse"
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "vis adresser til foretrukne nøkkeltjenere under signaturbekreftelse"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 msgid "show user ID validity during signature verification"
 msgstr "vis gyldighet for bruker-ID under signaturbekreftelse"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "vis opphevede og utgåtte bruker-id-er under signaturbekreftelse"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 msgid "show only the primary user ID in signature verification"
 msgstr "bare vis primærbrukerens ID under signaturbekreftelse"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige kontrollvalg\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr "ugyldige kontrollvalg\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "klarte ikke å endre «exec»-sti til %s\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig «auto-key-locate»-liste\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ugyldig «auto-key-locate»-liste\n"
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "ugyldig argument for valget «%.50s»\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan lage en kjernefil.\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "du kan ikke bruke %s med %s.\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s gir ikke mening med %s.\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "ADVARSEL: kjører med falsk systemtid: "
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, 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:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3952
-#, 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:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt komprimeringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt kontrollsum-algoritme for sertifisering er ugyldig\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, 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:3987
+#: g10/gpg.c:3950
 #, 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:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ugyldig standardoppsett\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig oppsett av krypteringsmetode\n"
 
-#: g10/gpg.c:4015
-#, 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:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig oppsett av kontrollsummetode\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig oppsett av komprimeringsmetode\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, 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:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enda med %s\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke å starte tillitsdatabase (TrustDB): %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetrisk kryptering av «%s» mislyktes: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, 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:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, 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:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nøkkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "eksportering som ssh-nøkkel mislyktes: %s\n"
 
-#: g10/gpg.c:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "søk på nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "oppdatering av nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "«%s» er en ugyldig summeringsalgoritme\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, 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:5366
+#: g10/gpg.c:5322
 #, 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:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv inn melding …\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "valgt adresse for sertifikasjonsregler er ugyldig\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "valgt adresse for signaturregler er ugyldig\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "valgt adresse for foretrukket nøkkeltjener er ugyldig\n"
@@ -3444,7 +3451,7 @@ msgstr "|FIL|hent nøkler fra valgt nøkkelknippe-FIL"
 msgid "make timestamp conflicts only a warning"
 msgstr "la konflikter mellom tidsstempler bare være en advarsel"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skrive statusinfo til denne FD"
 
@@ -3473,157 +3480,157 @@ msgstr "Ingen hjelp tilgjengelig"
 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"
@@ -3632,175 +3639,175 @@ msgstr ""
 "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:1998 g10/import.c:3146
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "nøkkel %s: ingen bruker-ID\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, c-format
 msgid "key %s: %s\n"
 msgstr "nøkkel %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr "avvist av importeringskontrollør"
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, 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:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, 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:2793
 #, 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:2801
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "nøkkel %s: feil under sending til agent: %s\n"
@@ -3813,203 +3820,203 @@ msgstr "nøkkel %s: feil under sending til agent: %s\n"
 #. * 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:2970
 #, 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:3117
 #, 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:3138 g10/import.c:3177
 #, 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:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "grunnen for opphevelse: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "kommentar til opphevelse: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nøkkel %s: ugyldig undernøkkelbinding\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3788
 #, 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:3812
 #, 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:3825
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nøkkel %s: ugyldig undernøkkeloppheving\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3840
 #, 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:3887
 #, 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:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nøkkel %s: hoppet over undernøkkel\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nøkkel %s: direkte nøkkelsignatur lagt til\n"
@@ -4050,14 +4057,14 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "%d duplikatsignatur fjernet\n"
 msgstr[1] "%d duplikatsignaturer fjernet\n"
 
-#: g10/key-check.c:726 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"
 msgstr[0] "%d signatur ble ikke kontrollert på grunn av manglende nøkkel\n"
 msgstr[1] "%d signaturer ble ikke kontrollert på grunn av manglende nøkkel\n"
 
-#: g10/key-check.c:734 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"
@@ -4110,15 +4117,15 @@ msgstr "nøkkelblokkressurs «%s»: %s\n"
 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:262
 msgid "[revocation]"
 msgstr "[oppheving]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[selvsignatur]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4129,17 +4136,17 @@ msgstr ""
 "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:389 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:390 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:408
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4149,52 +4156,52 @@ msgstr ""
 "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:425
 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:553
 #, 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:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  Klarte ikke å signere.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Bruker-ID «%s» er utgått."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Bruker-ID «%s» er ikke selvsignert."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Bruker-ID «%s» er signerbar.  "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr "Signere den? (j/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4203,11 +4210,11 @@ msgstr ""
 "Selvsignaturen på «%s»\n"
 "er en PGP 2.x-aktig signatur.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4216,11 +4223,11 @@ msgstr ""
 "Gjeldende signatur på «%s»\n"
 "er utgått.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4229,43 +4236,43 @@ msgstr ""
 "Din nåværede signatur på «%s»\n"
 "er en lokal signatur.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "Denne nøkkelen er utgått."
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4275,31 +4282,31 @@ msgstr ""
 "tilhører den overnevnte personen? Skriv «0» hvis du ikke vet\n"
 "svaret.\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, 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:876
 #, 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:878
 #, 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:881
 #, 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:888
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Hva velger du? (skriv «?» for mer informasjon): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4308,234 +4315,234 @@ msgstr ""
 "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:923
 msgid "This will be a self-signature.\n"
 msgstr "Dette skal være en selvsignatur.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 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:935
 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:945
 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:952
 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:959
 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:964
 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:969
 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:981
 msgid "Really sign? (y/N) "
 msgstr "Er du sikker på at du vil signere? (j/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering mislyktes: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 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:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "lagre og avslutte"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 msgid "show key fingerprint"
 msgstr "vise nøkkelens fingeravtrykk"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "show the keygrip"
 msgstr "vis nøkkelgrep"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "vis nøkler og bruker-id-er"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "velger bruker-ID N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr "velger bruker-ID N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr "sjekke signaturer"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 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:1286
 msgid "sign selected user IDs locally"
 msgstr "signerer valgte bruker-id-er lokalt"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 msgid "sign selected user IDs with a trust signature"
 msgstr "signer valgte bruker-id-er med tillitssignatur"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 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:1291
 msgid "add a user ID"
 msgstr "legg til bruker-ID"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "legg til foto-ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr "slett valgte bruker-id-er"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr "legg til undernøkkel"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr "legg til nøkkel på et smartkort"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr "flytt nøkkel til et smartkort"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr "flytt en sikkerhetskopi-nøkkel til et smartkort"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 msgid "delete selected subkeys"
 msgstr "slett valgte undernøkler"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "legg til opphevingsnøkkel"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 msgid "delete signatures from the selected user IDs"
 msgstr "slett signaturer fra valgte bruker-id-er"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1314
 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:1316
 msgid "flag the selected user ID as primary"
 msgstr "marker valgt bruker-ID som primær"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "vis innstillinger (avansert)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "vis innstillinger (detaljert)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 msgid "set preference list for the selected user IDs"
 msgstr "velg oppsettsliste for valgte bruker-id-er"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1325
 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:1327
 msgid "set a notation for the selected user IDs"
 msgstr "endre notat for valgte bruker-id-er"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1329
 msgid "change the passphrase"
 msgstr "endre passordfrase"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "endre eiertillit"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 msgid "revoke signatures on the selected user IDs"
 msgstr "opphev signaturer på valgte bruker-id-er"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 msgid "revoke selected user IDs"
 msgstr "opphev valgte bruker-id-er"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "revoke key or selected subkeys"
 msgstr "opphev nøkkel eller valgte undernøkler"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "enable key"
 msgstr "ta nøkkel i bruk"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr "ta nøkkel ut av bruk"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr "vis valgte foto-id-er"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 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:1349
 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:1470
 msgid "Secret key is available.\n"
 msgstr "Hemmelig nøkkel er tilgjengelig.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 #, 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:1574
 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:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4549,286 +4556,270 @@ msgstr ""
 "  (nrsign), eller hvilken som helst kombinasjon av disse (ltsign, tnrsign, "
 "osv.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "Nøkkelen er opphevet."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 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:1682
 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:1690
 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:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Bruk kommandoen «%s».)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 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:1756
 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:1814 g10/keyedit.c:1854
 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 msgid "You must select exactly one key.\n"
 msgstr "Du må velge minst én nøkkel.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 msgid "Command expects a filename argument\n"
 msgstr "Kommandoen forventer et filnavn-argument\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "Klarte ikke å åpne «%s»: %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, 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:1969
 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:1975
 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:1977
 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:2015
 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:2016
 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:2034
 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:2045
 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:2047
 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:2105
 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:2150
 msgid "Set preference list to:\n"
 msgstr "Bytt oppsettsliste til:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 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:2159
 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:2233
 msgid "Save changes? (y/N) "
 msgstr "Vil du lagre endringer? (j/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr "Vil du avslutte uten å lagre? (j/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, 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:2557
+#: g10/keyedit.c:2558
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "klarte ikke å oppheve siste gyldige bruker-ID.\n"
 
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2584
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "opphevelse av bruker-id mislyktes: %s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "endring av primær bruker-ID mislyktes: %s\n"
 
-#: g10/keyedit.c:2677
+#: g10/keyedit.c:2717
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "«%s» er ikke et fingeravtrykk\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "«%s» er ikke primært fingeravtrykk\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Bruker-ID «%s» er ugyldig: %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "No matching user IDs."
 msgstr "Ingen treff på bruker-id-er."
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "Nothing to sign.\n"
 msgstr "Ingenting å signere.\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Ikke signert av deg.\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, 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:3211
+#: g10/keyedit.c:3251
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "«%s» er en ugyldig utløpstid\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "«%s» er et ugyldig fingeravtrykk\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "fant ikke undernøkkel «%s»\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Kontrollsum: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Funksjoner: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr "Nøkkeltjener no-modify"
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Foretrukket nøkkeltjener: "
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr "Notasjoner: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "opprettet: %s"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr "opphevet: %s"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr "utgikk: %s"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "utgår: %s"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr "bruk: %s"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr "kortnr.: "
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr "gyldighet: %s"
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Denne nøkkelen er ikke i bruk"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4836,17 +4827,17 @@ msgstr ""
 "Merk: du bør starte programmet på nytt for å sikre at nøkkel-gyldigheten\n"
 "som vises her er riktig.\n"
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "utgått"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4855,17 +4846,17 @@ msgstr ""
 "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:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "ADVARSEL: Undernøkkel for kryptering utløper snart.\n"
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4875,74 +4866,74 @@ msgstr ""
 "føre til at\n"
 "         enkelte PGP-versjoner avviser nøkkelen.\n"
 
-#: g10/keyedit.c:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 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:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 #, 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:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slette denne gode signaturen? (j/N/a)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vil du slette denne ugyldige signaturen? (j/N/q)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vil du slette denne ukjente signaturen? (j/N/q)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Er du sikker på at du vil slette denne selvsignaturen? (j/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Slettet %d signatur.\n"
 msgstr[1] "Slettet %d signaturer.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Ingen ble slettet.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Bruker-ID «%s» pakket sammen: %s\n"
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Bruker-ID «%s»: %d signatur fjernet\n"
 msgstr[1] "Bruker-ID «%s»: %d signaturer fjernet\n"
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Bruker-ID «%s»: allerede minimert\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Bruker-ID «%s»: allerede renset\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4952,216 +4943,216 @@ msgstr ""
 "         kan dette føre til at enkelte PGP-versjoner ikke vil kunne bruke "
 "nøkkelen.\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Skriv inn oppheverens bruker-ID: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 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:4719
+#: g10/keyedit.c:4611
 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:4788
+#: g10/keyedit.c:4680
 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:4793
+#: g10/keyedit.c:4685
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Endrer utløpstid for undernøkkel.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Endrer utløpstid for primærnøkkel.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 #, 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:4915
+#: g10/keyedit.c:4807
 #, 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:5033
+#: g10/keyedit.c:4925
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signerings-undernøkkel %s er allerede kryssertifisert\n"
 
-#: g10/keyedit.c:5039
+#: g10/keyedit.c:4931
 #, 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:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Velg én bruker-ID.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, 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:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr "Skriv inn adresse til foretrukket nøkkeltjener: "
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 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:5451
+#: g10/keyedit.c:5345
 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:5516
+#: g10/keyedit.c:5410
 msgid "Enter the notation: "
 msgstr "Skriv inn notat: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 msgid "Proceed? (y/N) "
 msgstr "Vil du fortsette? (j/N) "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruker-ID med indeks %d\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruker-ID med kontrollsum %s\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Ingen undernøkkel med ID «%s».\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernøkkel med indeks %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruker-ID: «%s»\n"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (ikke-eksporterbar)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne signaturen utgikk %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 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:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vil du lage et opphevelsessertifikat for denne signaturen? (j/N) "
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr " (kan ikke oppheves)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "opphevet med nøkkelen %s %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du er i ferd med å oppheve følgende signaturer:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Er du sikker på at du vil lage opphevelsessertifikatene? (j/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "ingen hemmelig nøkkel\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, 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:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "bruker-ID «%s» er allerede opphevet\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Klarte ikke å oppheve siste gyldige bruker-ID.\n"
 
-#: g10/keyedit.c:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nøkkelen %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernøkkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, 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"
@@ -5202,33 +5193,33 @@ msgstr "for mange krypteringsinnstillinger\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "«%s» er et ugyldig oppsettsvalg\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "skriver direkte signatur\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "skriver nøkkelbindende signatur\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ugyldig nøkkelstørrelse. Bruker %u bit\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nøkkelstørrelse rundet opp til %u bit\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5236,19 +5227,19 @@ msgstr ""
 "ADVARSEL: noen OpenPGP-programmer klarer ikke å behandle DSA-nøkler med "
 "denne kontrollsum-størrelsen\n"
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr "Signere"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr "Bekrefte"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr "Kryptere data"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr "Autentisere"
 
@@ -5266,180 +5257,180 @@ msgstr "Autentisere"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, 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:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr "Tillatte handlinger: "
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Slå av/på signeringsfunksjon\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Slå av/på krypteringsfunksjon\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Slå av/på autentiseringsfunksjon\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Ferdig\n"
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, 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:2131
+#: g10/keygen.c:2108
 #, 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:2134
+#: g10/keygen.c:2111
 #, 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:2136
+#: g10/keygen.c:2113
 #, 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:2142
+#: g10/keygen.c:2119
 #, 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:2144
+#: g10/keygen.c:2121
 #, 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:2150
+#: g10/keygen.c:2127
 #, 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:2152
+#: g10/keygen.c:2129
 #, 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:2158
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid "   (%d) sign, encrypt\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) signer, krypter\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (kun signering)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, 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:2163
+#: g10/keygen.c:2140
 #, 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:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) Nøkkel\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, 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:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Skriv inn nøkkelgrep: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Ingen nøkkel med dette nøkkelgrepet\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Kortets serienummer: %s\n"
 
-#: g10/keygen.c:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Tilgjengelige nøkler:\n"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "rundet av til %u bit\n"
 
-#: g10/keygen.c:2570
+#: g10/keygen.c:2547
 #, 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:2578
+#: g10/keygen.c:2555
 #, 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:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 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:2641
+#: g10/keygen.c:2618
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Velg elliptisk kurve:\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5455,7 +5446,7 @@ msgstr ""
 "      <n>m = nøkkelen utgår om n months\n"
 "      <n>y = nøkkelen utgår om n years\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5471,38 +5462,38 @@ msgstr ""
 "      <n>m = signaturen utgår om n months\n"
 "      <n>y = signaturen utgår om n years\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Nøkkelen er gyldig for? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen er gyldig for? (%s) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "ugyldig verdi\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr "Nøkkel utgår ikke i det hele tatt\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen utgår ikke i det hele tatt\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nøkkel utgår %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen utgår %s\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5510,11 +5501,11 @@ msgstr ""
 "Systemet ditt klarer ikke å håndtere datoer etter 2038.\n"
 "Likevel håndteres det korrekt fram til 2106.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/N)? "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5528,7 +5519,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5544,41 +5535,41 @@ msgstr ""
 "    «Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>»\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Fullt navn: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Ugyldig tegn i navn\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, 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:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "E-postadresse: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Ugyldig e-postadresse\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Ugyldig tegn i kommentar\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Du bruker tegnsettet «%s».\n"
 
-#: g10/keygen.c:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5589,11 +5580,11 @@ msgstr ""
 "    «%s»\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Valgt bruker-ID finnes allerede på denne nøkkelen!\n"
 
@@ -5608,31 +5599,31 @@ msgstr "Valgt bruker-ID finnes allerede på denne nøkkelen!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnKeEeRrAa"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Endre (N)avn, (E)postadresse eller (A)vslutt? "
 
-#: g10/keygen.c:3148
+#: g10/keygen.c:3125
 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Rett opp feilen først\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5644,18 +5635,18 @@ msgstr ""
 "diskene jobbe) mens dette pågår. Da får\n"
 "tallgeneratoren bedre muligheter til å samle inn vilkårlighetsdata.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nøkkelgenerering mislyktes: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5666,65 +5657,65 @@ msgstr ""
 "    «%s»\n"
 "\n"
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr "Vil du fortsette? (J/n) "
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Det finnes allerede en nøkkel for «%s»\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 msgid "Create anyway? (y/N) "
 msgstr "Vil du lage nøkkel likevel? (j/N) "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, c-format
 msgid "creating anyway\n"
 msgstr "lager likevel\n"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, 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:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Nøkkelgenerering ble avbrutt.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "klarte ikke å lage sikkerhetskopifila «%s»: %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "skriver offentlig nøkkel til «%s»\n"
 
-#: g10/keygen.c:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "fant ikke skrivbart offentlig nøkkelknippe: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "feil under skriving av offentlig nøkkelknippe «%s»: %s\n"
 
-#: g10/keygen.c:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig nøkkel opprettet og signert.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 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"
@@ -5733,7 +5724,7 @@ msgstr ""
 "vurdere å bruke kommandoen «--edit-key» for å lage en\n"
 "undernøkkel til dette formålet.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5741,7 +5732,7 @@ msgstr ""
 "nøkkel har blitt opprettet %lu sekund i framtiden (time warp- eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5749,23 +5740,23 @@ msgstr ""
 "nøkkel har blitt opprettet %lu sekunder i framtiden (time warp- eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr "Er du sikker på at du vil fortsette? (j/N) "
 
@@ -5773,74 +5764,90 @@ msgstr "Er du sikker på at du vil fortsette? (j/N) "
 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"
 msgstr[0] "%d gyldig signatur\n"
 msgstr[1] "%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"
 msgstr[0] "%d signatur ble ikke kontrollert på grunn av feil\n"
 msgstr[1] "%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"
 msgstr[0] "Advarsel: hoppet over %lu nøkkel pga. for høy størrelse\n"
 msgstr[1] "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:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Fingeravtrykk for primærnøkkel:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr " Fingeravtrykk for primærnøkkel:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "      Fingeravstrykk for undernøkkel:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr "      Nøkkelfingeravtrykk ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr "      Serienummer for kort ="
 
@@ -6211,7 +6218,7 @@ msgstr "binær"
 msgid "textmode"
 msgstr "tekstmodus"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "ukjent"
 
@@ -6346,28 +6353,28 @@ msgstr "Ukomprimert"
 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:1614
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "«%s» er et flertydig valg\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "«%s» er et ukjent valg\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "«%s» er en ukjent svak summeringsmetode\n"
@@ -6487,7 +6494,7 @@ msgstr ""
 "opprettet %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6501,70 +6508,70 @@ msgstr ""
 "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:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Skriv inn JPEG-filnavn for foto-ID: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, 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:239
 #, 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:241
 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:257
 #, 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:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Er dette bildet riktig (j/N/q)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, 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:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "unaturlig avslutning av eksternt program\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6572,7 +6579,7 @@ msgstr ""
 "eksterne programkall er slått av på grunn av utrygge tillatelser til "
 "oppsettsfil\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "klarte ikke å vise foto-ID.\n"
@@ -6900,12 +6907,12 @@ msgstr "«%s» er en ukjent standardmottaker\n"
 msgid "no valid addressees\n"
 msgstr "ingen gyldige mottakere\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Merk: nøkkel %s har ingen %s-funksjon\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Merk: nøkkel %s har ingen innstilling for %s\n"
@@ -7960,7 +7967,7 @@ msgstr "bruker tillitsmodell %s\n"
 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"
@@ -7990,38 +7997,38 @@ msgstr "kjør «--check-trustdb»\n"
 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"
 msgstr[0] "%d nøkkel behandlet"
 msgstr[1] "%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"
 msgstr[0] "(%d gyldighetsantall klarert)\n"
 msgstr[1] "(%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 ""
@@ -8147,7 +8154,7 @@ msgstr ""
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8155,7 +8162,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8197,7 +8204,7 @@ msgstr "|A|Skriv inn admin-PIN"
 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:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8284,71 +8291,71 @@ msgstr[1] "nøkkelgenerering fullført (%d sekunder)\n"
 msgid "response does not contain the public key data\n"
 msgstr "svar inneholder ikke offentlig nøkkeldata\n"
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Skriv inn admin-PIN"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 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:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, 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:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, 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:1654
+#: 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:1701
+#: 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:2074
+#: 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:2082
+#: 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:2092
+#: 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:2102
+#: 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:2104
+#: 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:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "feil under henting av ny PIN: %s\n"
@@ -8604,13 +8611,13 @@ msgstr "startet håndteringsprogram for fd %d\n"
 msgid "handler for fd %d terminated\n"
 msgstr "avsluttet håndteringsprogram for fd %d\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8619,11 +8626,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr "kontrollmodell forespurt av sertifikat: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:199 sm/certchain.c:2211
 msgid "chain"
 msgstr "kjede"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 msgid "shell"
 msgstr "skall"
 
@@ -8646,235 +8653,235 @@ msgstr "regelsett merket som kritisk uten oppsatte regler"
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "klarte ikke å hente fingeravtrykk\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, 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:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "antall ustedere funnet: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, 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:818
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "antall treff på sertifikater: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "klarte ikke å tildele nøkkeldatabase-verdi\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1260 sm/certchain.c:1264
 msgid "certificate has been revoked"
 msgstr "sertifikatet er opphevet"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr "sertifikatet har ukjent status"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, 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:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr "sertifikatet er ikke gyldig enda"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 msgid "root certificate not yet valid"
 msgstr "rotsertifikat er ikke gyldig enda"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr "mellomsertifikat er ikke gyldig enda"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr "sertifikatet er utgått"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 msgid "root certificate has expired"
 msgstr "rotsertifikat er utgått"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 msgid "intermediate certificate has expired"
 msgstr "mellomsertifikat er utgått"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, 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:1404
 msgid "certificate with invalid validity"
 msgstr "sertifikat med ugyldig gyldighetsverdi"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr "signatur ikke laget innenfor sertifikatets levetid"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr "sertifikat ikke laget innenfor utsteders levetid"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "mellomsertifikat ikke laget innenfor utsteders levetid"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  signatur opprettet "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (sertifikat opprettet "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (sertifikat gyldig fra "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     utsteder gyldig fra "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingeravtrykk=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, 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:1505
 #, 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:1511
 #, 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:1570
 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:1634
 msgid "no issuer found in certificate"
 msgstr "fant ingen utsteder i sertifikat"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 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:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "rotsertifikat er ikke merket som troverdig"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, 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:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr "fant ikke utstedersertifikat"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "sertifikatet har ugyldig signatur"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1911 dirmngr/validate.c:693
 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:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr "sertifikatet er gyldig\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "mellomsertifikat er ok\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, c-format
 msgid "root certificate is good\n"
 msgstr "rotsertifikat er gyldig\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr "bytter til kjedemodell"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr "gyldighetsmodell: %s"
@@ -8897,7 +8904,7 @@ msgstr "kjernen er full\n"
 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:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "ingen"
 
@@ -8932,42 +8939,42 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "opprettet %s, utgår %s.\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, 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:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, 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:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, 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:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, 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:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, 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:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "sertifikatet egner seg ikke til kryptering\n"
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "sertifikatet egner seg ikke til signering\n"
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9524,7 +9531,7 @@ msgstr "kontrollsum-algoritme brukt av undertegnet %d: %s (%s)\n"
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "søk etter godkjent sertifikat mislyktes: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
@@ -9717,7 +9724,7 @@ msgstr "fjerner hurtiglager-fil «%s»\n"
 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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "feil under lukking av hurtiglager-fil: %s\n"
@@ -9965,133 +9972,133 @@ msgstr "«%s» er en ugyldig summeringsalgoritme\n"
 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:1849 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:1923
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1938
 #, 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:1945
 #, 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:1949
 #, 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:1969
 #, 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:1984
 #, 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:2011
 #, 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:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "finner CRL-utstedersertifikat med «authorityKeyIdentifier»\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL-signaturbekreftelse mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2084
 #, 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:2226
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2233
 #, 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:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2301
 #, 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:2308
 #, 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:2333
 #, 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:2337
 #, 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:2353
 #, 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:2363
 #, 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:2414
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "lager hurtiglager-fil «%s»\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, 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:2460
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10100,12 +10107,12 @@ msgstr ""
 "oppdatering av DIR-fil mislyktes. Hurtiglager-oppføring går tapt neste gang "
 "programmet starter\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2497
 #, 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:2520
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10113,54 +10120,54 @@ msgstr ""
 " FEIL: CRL blir ikke brukt fordi den fremdeles var for gammel etter "
 "oppdatering.\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2523
 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:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr " FEIL: CRL blir ikke brukt\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 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:2551
 #, 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:2558
 #, 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:2569
 #, 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:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr "Avslutt CRL-utskrift\n"
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch via DP mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "crl_cache_insert via DP mislyktes: %s\n"
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert via utsteder mislyktes: %s\n"
@@ -10507,12 +10514,12 @@ msgstr "bruk: %s [valg] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "kolon tillates ikke i sokkelnavn\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "henting av CRL fra «%s» mislyktes: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "behandling av CRL fra «%s» mislyktes: %s\n"
@@ -10759,91 +10766,91 @@ msgstr "summering av OCSP-svar for «%s» mislyktes: %s\n"
 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:582
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "tildeling av listeelement mislyktes: %s\n"
 
-#: dirmngr/ocsp.c:598 dirmngr/ocsp.c:782
+#: 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:642
+#: 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:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "fant ikke utstedersertifikat: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: 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:698
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "klient sendte ikke utstedersertifikat\n"
 
-#: dirmngr/ocsp.c:708
+#: 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:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "ingen forvalgt OCSP-svartjeneste\n"
 
-#: dirmngr/ocsp.c:753
+#: 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:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "bruker forvalgt OCSP-svartjeneste «%s»\n"
 
-#: dirmngr/ocsp.c:765
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "bruker OCSP-svartjeneste «%s»\n"
 
-#: dirmngr/ocsp.c:822
+#: 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:847
+#: 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:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "bra"
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: 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:901
+#: 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:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP-svartjeneste sendte for gammel status\n"
@@ -10857,63 +10864,63 @@ msgstr "«assuan_inquire»(%s) mislyktes: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "«assuan_inquire» mislyktes: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "feil under sending av data: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "«start_cert_fetch» mislyktes: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1776
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "«fetch_next_cert» mislyktes: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d overskredet\n"
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "klarte ikke å tildele kontrollstruktur: %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "klarte ikke å tildele assuan-kontekst: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "klarte ikke å starte opp tjener: %s\n"
 
-#: dirmngr/server.c:3062
+#: dirmngr/server.c:3078
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "klarte ikke å registrere kommandoer i Assuan: %s\n"
 
-#: dirmngr/server.c:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan-godkjenningsproblem: %s\n"
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan-behandling mislyktes: %s\n"
@@ -11225,92 +11232,107 @@ msgstr ""
 "Syntaks: gpg-check-pattern [valg] mønsterfil\n"
 "Kontroller passordfrase oppgitt på standard innkanal mot valgt mønsterfil\n"
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: 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:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: 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:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: 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:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3707
+#: 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:3708
+#: 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:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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"
 
diff --git a/po/pl.gmo b/po/pl.gmo
index 98ee749..078041a 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index c090bc5..9500139 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.2.24\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2020-11-18 17:35+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -147,8 +147,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Hasło:"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "nie pasują - proszę spróbować jeszcze raz"
 
@@ -197,17 +197,17 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "błąd pobierania numeru seryjnego karty: %s\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Proszę ponownie wprowadzić to hasło"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -218,7 +218,7 @@ msgid ""
 msgstr ""
 "Proszę wprowadzić hasło do zabezpieczenia ważnego obiektu w systemie GnuPG."
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -229,25 +229,25 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "nie można otworzyć ,,%s'': %s\n"
@@ -257,12 +257,12 @@ msgstr "nie można otworzyć ,,%s'': %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "nie znaleziono pasujÄ…cego klucza karty: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "błąd pobierania listy kart: %s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -270,20 +270,20 @@ msgid ""
 msgstr ""
 "Proces ssh zarządał użycia klucza%%0a  %s%%0A  (%s)%%0ACzy zezwolić na to?"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Zgoda"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Odmowa"
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -292,7 +292,7 @@ msgstr ""
 "Proszę wprowadzić hasło do zabezpieczenia odebranego klucza tajnego%%0A   %s"
 "%%0A   %s%%0Aw miejscu przechowywania kluczy gpg-agenta"
 
-#: agent/command-ssh.c:3797
+#: agent/command-ssh.c:3837
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "nie udało się utworzyć strumienia z gniazda: %s\n"
@@ -418,212 +418,218 @@ msgstr "Proszę wprowadzić hasło do%0Azabezpieczenia swojego nowego klucza"
 msgid "Please enter the new passphrase"
 msgstr "Proszę wprowadzić nowe hasło"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Opcje przydatne do diagnostyki"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr "uruchomienie w trybie demona (w tle)"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "bez odłączania od konsoli"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr "wyjście poleceń w stylu sh"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr "wyjście poleceń w stylu csh"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 msgid "|FILE|read options from FILE"
 msgstr "|PLIK|odczyt opcji z PLIKU"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr "Opcje sterujące wyjściem diagnostycznym"
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "więcej komunikatów"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "mniej komunikatów"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|PLIK|zapis logów trybu serwera do PLIKU"
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr "Opcje sterujÄ…ce konfiguracjÄ…"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 msgid "do not use the SCdaemon"
 msgstr "nieużywanie SCdaemona"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|użycie PGM jako programu SCdaemon"
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 #, 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:215
+#: agent/gpg-agent.c:216
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAZWA|przyjęcie poleceń poprzez NAZWĘ"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr "ignorowanie żądań zmiany TTY"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr "ignorowanie żądań zmiany ekranu X"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 msgid "enable ssh support"
 msgstr "włączenie obsługi ssh"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|użycie ALGO do wyświetlania odcisków ssh"
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 msgid "enable putty support"
 msgstr "włączenie obsługi putty"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "włączenie obsługi putty"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "Opcje sterujące bezpieczeństwem"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|przedawnienie pamiętanych PIN-ów po N sekundach"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|przedawnienie kluczy SSH po N sekundach"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 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:248
+#: agent/gpg-agent.c:256
 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:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr "nieużywanie pamięci PIN-ów przy podpisywaniu"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 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:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "niezezwalanie klientom na oznaczanie kluczy jako ,,zaufanych''"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 msgid "allow presetting passphrase"
 msgstr "zezwolenie na predefiniowane hasło"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr "Opcje wymuszające politykę haseł"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr "niezezwalanie na pominięcie polityki haseł"
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 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:271
+#: agent/gpg-agent.c:279
 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:274
+#: agent/gpg-agent.c:282
 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:278
+#: agent/gpg-agent.c:286
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|przedawnianie haseł po N dniach"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 msgid "do not allow the reuse of old passphrases"
 msgstr "niezezwalanie na ponowne użycie starych haseł"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Opcje sterujące bezpieczeństwem"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr "niezezwalanie wywołującym na nadpisywanie pinentry"
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|użycie PGM jako programu do wprowadzania PIN-u"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|ustawienie limitu czasu Pinentry na N sekund"
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: 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:570
+#: agent/gpg-agent.c:582
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Składnia: @GPG_AGENT@ [opcje] (-h wyświetla pomoc)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -631,135 +637,135 @@ msgstr ""
 "Składnia: @GPG_AGENT@ [opcje] [polecenie [argumenty]]\n"
 "ZarzÄ…dzanie kluczem tajnym dla @GNUPG@\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "podano błędny poziom diagnostyki ,,%s''\n"
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skrótów wiadomości jest niepoprawny\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: agent/gpg-agent.c:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją.\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "nie można utworzyć gniazda: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "nazwa gniazda ,,%s'' zbyt długa\n"
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "błąd podczas pobierania nonce z gniazda\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "błąd podczas przypisywania gniazda do ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, 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:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "nasłuchiwanie na gnieździe ,,%s''\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "nie można utworzyć katalogu ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "katalog ,,%s'' utworzony\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() nie powiodło się dla ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, 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:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, 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:2768
+#: agent/gpg-agent.c:2882
 #, 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:2773
+#: agent/gpg-agent.c:2887
 #, 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:2848
+#: agent/gpg-agent.c:2962
 #, 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:2853
+#: agent/gpg-agent.c:2967
 #, 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:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, 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:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s zatrzymany\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1030,7 +1036,7 @@ msgstr "sprawdzenie złożonego podpisu nie powiodło się: %s\n"
 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:1602
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "algorytm klucza publicznego %d (%s) nie jest obsługiwany\n"
@@ -1045,52 +1051,52 @@ msgstr "algorytm ochrony %d (%s) nie jest obsługiwany\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1120,18 +1126,18 @@ msgstr "Ostrzeżenie: niebezpieczne prawa własności do %s ,,%s''\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Ostrzeżenie: niebezpieczne prawa dostępu do %s ,,%s''\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "oczekiwanie aż plik ,,%s'' stanie się dostępny...\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiodła się: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "tak"
 
@@ -1185,8 +1191,8 @@ msgstr "brak miejsca w bezpiecznej pamięci podczas przydzielania %lu bajtów"
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1206,76 +1212,76 @@ msgstr "OSTRZEŻENIE: ,,%s%s'' jest przestarzałą opcją - nie ma efektu\n"
 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:432 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"
@@ -1423,11 +1429,11 @@ msgstr "�ańcuch certyfikatów poprawny"
 msgid "Root certificate trustworthy"
 msgstr "Certyfikat główny jest zaufany"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 msgid "no CRL found for certificate"
 msgstr "nie znaleziono CRL dla certyfikatu"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 msgid "the available CRL is too old"
 msgstr "dostępny CRL jest zbyt stary"
 
@@ -1464,7 +1470,7 @@ msgstr "Brak pomocy dla ,,%s''."
 msgid "ignoring garbage line"
 msgstr "zignorowano błędną linię"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "[none]"
 msgstr "[brak]"
 
@@ -1508,36 +1514,36 @@ msgstr "iconv_open nie powiodło się: %s\n"
 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
 #, 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"
@@ -1547,92 +1553,92 @@ msgstr "oczekiwanie na blokadÄ™ %s...\n"
 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
+#: 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"
@@ -1640,12 +1646,12 @@ msgstr ""
 "znak kodowania quoted-printable w opakowaniu ASCII - prawdopodobnie\n"
 "przekłamanie wprowadzone przez serwer pocztowy\n"
 
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, c-format
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "[ nieczytelne dla człowieka (%zu bajtów: %s%s) ]"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1654,32 +1660,32 @@ msgstr ""
 "nazwa adnotacji musi zawierać tylko znaki drukowalne lub spacje i kończyć "
 "siÄ™ znakiem ,,=''\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, 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:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, 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:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "OSTRZEŻENIE: napotkano błędne dane adnotacji\n"
@@ -1693,7 +1699,7 @@ msgstr "nie udało się przekazać zapytania %s do klienta\n"
 msgid "Enter passphrase: "
 msgstr "Hasło: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 g10/sign.c:473
 #: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
@@ -1711,7 +1717,7 @@ msgstr "błąd odczytu z %s: %s\n"
 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:2330
+#: 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"
@@ -1750,169 +1756,169 @@ msgstr "niedopuszczalne przekierowanie HTTP z serwera zostało wyczyszczone"
 msgid "server uses an invalid certificate"
 msgstr "serwer używa błędnego certyfikatu"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "Pan"
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "Pani"
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "wymuszono"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 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:1500
+#: g10/card-util.c:803 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:1502
+#: g10/card-util.c:805 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:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Nazwisko posiadacza karty: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "ImiÄ™ posiadacza karty: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Dane logowania (nazwa konta): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Prywatne dane DO: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Preferowane języki: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 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:1800
+#: g10/card-util.c:1199 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:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "Odcisk CA:"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 msgid "not an OpenPGP card"
 msgstr "to nie jest karta OpenPGP"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr "Zastąpić istniejący klucz? (t/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 tools/gpg-card.c:3363
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1928,99 +1934,99 @@ msgstr ""
 "       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:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr "Zmiana atrybutu klucza karty dla: "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 msgid "Signature key\n"
 msgstr "Klucz do podpisów\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 msgid "Encryption key\n"
 msgstr "Klucz do szyfrowania\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr "Klucz do uwierzytelniania\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Niewłaściwy wybór.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 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:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2031,181 +2037,181 @@ msgstr ""
 "   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:1741
 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:1743 g10/card-util.c:1833
 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:1744 g10/card-util.c:1835
 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:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Klucz do uwierzytelniania\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 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:1876
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD nie powiodło się: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 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:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "wyjście z tego menu"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr "pokazanie poleceń administratora"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 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:3687
+#: g10/card-util.c:2260 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:3688
+#: g10/card-util.c:2261 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:3689
+#: g10/card-util.c:2262 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:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "zmiana nazwy logowania"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 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:3692
+#: g10/card-util.c:2265 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:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "zmiana odcisku CA"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 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:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "wygenerowanie nowych kluczy"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 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:3698
+#: g10/card-util.c:2271 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:3699
+#: g10/card-util.c:2272 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:3703
+#: g10/card-util.c:2273 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:2275
 #, 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:2276
 msgid "change the key attribute"
 msgstr "zmiana atrybutu klucza"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/karta> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 msgid "Admin-only command\n"
 msgstr "Polecenie tylko dla administratora\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr "Polecenia dla administratora sÄ… dozwolone\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie działa z tym poleceniem\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2265,9 +2271,9 @@ msgstr "klucza"
 msgid "subkey"
 msgstr "podklucza"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powiódł się: %s\n"
@@ -2300,19 +2306,19 @@ msgstr ""
 "OSTRZEŻENIE: wymuszone użycie szyfru %s (%d) kłóci się z ustawieniami "
 "adresata\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, 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"
@@ -2322,45 +2328,46 @@ msgstr "szyfr ,,%s'' nie może być używany w trybie %s\n"
 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:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "błąd podczas tworzenia hasła: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "szyfrem %s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr ",,%s'' już jest skompresowany\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "OSTRZEŻENIE: plik ,,%s'' jest pusty\n"
 
-#: g10/encrypt.c:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, 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:862
+#: g10/encrypt.c:853
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "odczyt z ,,%s''\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2369,13 +2376,13 @@ msgstr ""
 "OSTRZEŻENIE: wymuszone użycie kompresji %s (%d) kłóci się z ustawieniami "
 "adresata\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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"
@@ -2403,61 +2410,73 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZEŻENIE: nic nie zostało wyeksportowane!\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2523,7 +2542,7 @@ msgstr ""
 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:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "poprawne argimenty dla opcji ,,%s'':\n"
@@ -2596,111 +2615,111 @@ msgstr "szybkie unieważnienie identyfikatora użytkownika"
 msgid "quickly set a new expiration date"
 msgstr "szybkie ustawienie nowej daty wygaśnięcia"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr "wygenerowanie pary kluczy z pełną funkcjonalnością"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu unieważnienia klucza"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "usunięcie klucza ze zbioru kluczy publicznych"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "usunięcie klucza ze zbioru kluczy prywatnych"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "quickly sign a key"
 msgstr "szybkie złożenie podpisu na kluczu"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 msgid "quickly sign a key locally"
 msgstr "szybkie złożenie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "quickly revoke a key signature"
 msgstr "szybkie unieważnienie podpisu klucza"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "złożenie podpisu na kluczu"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "złożenie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "zmiana hasła"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "odświeżenie wszystkich kluczy z serwera"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "import/dołączenie kluczy"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr "wyświetlenie stanu karty"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr "zmiana danych na karcie"
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr "zmiana PIN-u karty"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 msgid "print message digests"
 msgstr "wypisanie skrótów wiadomości"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "uruchomienie w trybie serwera"
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|WARTOŚĆ|ustawienie polityki TOFU dla klucza"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|użycie NAZWY jako domyślnego klucza tajnego"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAZWA|szyfrowanie także dla odbiorcy NAZWA"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|określ adres email"
 
@@ -2716,59 +2735,59 @@ msgstr "pozostawienie bez zmian"
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plików"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Opcje sterujące bezpieczeństwem"
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Opcje sterujące wyjściem diagnostycznym"
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|PLIK|zapis wyjścia do PLIKU"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|ustawienie poziomu kompresji N (0 - bez)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 #, 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:773
+#: g10/gpg.c:772
 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:776
+#: g10/gpg.c:775
 msgid "import missing key from a signature"
 msgstr "import brakujÄ…cego klucza z podpisu"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 msgid "include the public key in signatures"
 msgstr "włączanie klucza publicznego do podpisów"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "zablokuj dostęp do dirmngr"
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2798,7 +2817,7 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2806,7 +2825,7 @@ msgstr ""
 "@\n"
 "(Pełną listę poleceń i opcji można znaleźć w podręczniku systemowym.)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2828,11 +2847,11 @@ msgstr ""
 " --list-keys [nazwy]        pokazanie kluczy\n"
 " --fingerprint [nazwy]      pokazanie odcisków kluczy\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Składnia: @GPG@ [opcje] [pliki] (-h wyświetla pomoc)"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1172
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2842,7 +2861,7 @@ msgstr ""
 "Podpisywanie, sprawdzanie podpisów, szyfrowanie, rozszyfrowywanie\n"
 "Domyślnie wykonywana operacja zależy od danych wejściowych\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2850,78 +2869,78 @@ msgstr ""
 "\n"
 "Obsługiwane algorytmy:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Skrótów: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "składnia: %s [opcje] %s\n"
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1698
 #, 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:1711
+#: g10/gpg.c:1701
 #, 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:1714
+#: g10/gpg.c:1704
 #, 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:1720
+#: g10/gpg.c:1710
 #, 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:1723
+#: g10/gpg.c:1713
 #, 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:1726
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "OSTRZEŻENIE: niebezpieczne prawa dostępu do rozszerzenia ,,%s''\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, 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:1735
+#: g10/gpg.c:1725
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2929,21 +2948,21 @@ msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego plik "
 "konfiguracyjny ,,%s''\n"
 
-#: g10/gpg.c:1738
+#: g10/gpg.c:1728
 #, 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:1744
+#: g10/gpg.c:1734
 #, 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:1747
+#: g10/gpg.c:1737
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2951,480 +2970,468 @@ msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego plik "
 "konfiguracyjny ,,%s''\n"
 
-#: g10/gpg.c:1750
+#: g10/gpg.c:1740
 #, 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:1966
+#: g10/gpg.c:1956
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr "wyświetlenie ID zdjęć przy wypisywaniu kluczy"
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 msgid "show key usage information during key listings"
 msgstr "pokazywanie informacji o zastosowaniu klucza przy wypisywaniu kluczy"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr "pokazywanie URL-i polityk przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 msgid "show all notations during signature listings"
 msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr "pokazywanie adnotacji użytkownika przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "pokazywanie URL-i preferowanych serwerów kluczy przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr "pokazywanie poprawności ID użytkownika przy wypisywaniu kluczy"
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 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:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr "pokazywanie unieważnionych i wygasłych podkluczy na listach kluczy"
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 msgid "show the keyring name in key listings"
 msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 msgid "show expiration dates during signature listings"
 msgstr "pokazywanie dat wygaśnięcia przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "ustawienia (zaawansowane)"
+
+#: g10/gpg.c:2197
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "nieznana polityka TOFU ,,%s''\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(,,help'' wyświetli listę wyborów)\n"
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Uwaga: %s nie jest do normalnego użytku!\n"
 
-#: g10/gpg.c:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, 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:3220
+#: g10/gpg.c:3194
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr ",,%s'' nie jest niepoprawnym adresem e-mail\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "błędny tryb pinentry ,,%s''\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "błędne źródło żądania ,,%s''\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr ",,%s'' nie jest poprawną nazwą zestawu znaków\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozumiały URL serwera kluczy\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "niepoprawne opcje filtrowania: %s\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr "wyświetlanie ID zdjęć przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 msgid "show all notations during signature verification"
 msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr "pokazywanie adnotacji użytkownika przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "pokazywanie URL-i preferowanych serwerów kluczy przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 msgid "show user ID validity during signature verification"
 msgstr "pokazywanie poprawności ID użytkownika przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 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:3424
+#: g10/gpg.c:3400
 msgid "show only the primary user ID in signature verification"
 msgstr "pokazywanie tylko głównego ID użytkownika przy sprawdzaniu podpisu"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, 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:3648
+#: g10/gpg.c:3621
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "Niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "błędny argument dla opcji ,,%.50s''\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, 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:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZEŻENIE: %s powoduje obejście %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno używać %s z %s!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w połączeniu z %s!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "OSTRZEŻENIE: działanie z fałszywym czasem systemowym: "
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, 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:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfrujÄ…cy jest niepoprawny\n"
 
-#: g10/gpg.c:3952
-#, 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:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm kompresji jest niepoprawny\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skrótów poświadczeń jest niepoprawny\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, 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:3987
+#: g10/gpg.c:3950
 #, 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:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "niewłaściwe domyślne ustawienia\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "niewłaściwe ustawienia szyfrów\n"
 
-#: g10/gpg.c:4015
-#, 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:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "niewłaściwe ustawienia skrótów\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "niewłaściwe ustawienia algorytmów kompresji\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, 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:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie działa z %s!\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiodło się: %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "szyfrowanie symetryczne ,,%s'' nie powiodło się: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, 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:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, 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:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 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:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbiór z serwera kluczy nie powiódł się: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powiódł się: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "eksport do klucza ssh powiódł się: %s\n"
 
-#: g10/gpg.c:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiodło się: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "odświeżenie kluczy z serwera nie powiodło się: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdjęcie opakowania ASCII nie powiodło się: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiodło się: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "niewłaściwy algorytm skrótu ,,%s''\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, 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:5366
+#: g10/gpg.c:5322
 #, 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:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoją wiadomość ...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu poświadczania jest niepoprawny\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpisów jest niepoprawny\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
@@ -3437,7 +3444,7 @@ msgstr "|PLIK|pobieranie kluczy ze zbioru PLIK"
 msgid "make timestamp conflicts only a warning"
 msgstr "nie traktować konfliktu datowników jako błędu"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 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"
 
@@ -3466,157 +3473,157 @@ msgstr "Pomoc niedostępna"
 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"
@@ -3625,173 +3632,173 @@ msgstr ""
 "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:1998 g10/import.c:3146
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "klucz %s: brak identyfikatora użytkownika\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, c-format
 msgid "key %s: %s\n"
 msgstr "klucz %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr "odrzucony przez filtr importu"
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "klucz %s: nowy klucz - pominięty\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, 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:2793
 #, 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:2801
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "klucz %s: błąd wysyłania do agenta: %s\n"
@@ -3804,207 +3811,207 @@ msgstr "klucz %s: błąd wysyłania do agenta: %s\n"
 #. * 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:2970
 #, 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:3117
 #, 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:3138 g10/import.c:3177
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "wczytywanie kluczy tajnych nie jest dozwolone\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "powód unieważnienia: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "komentarz do unieważnienia: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klucz %s: niepoprawne dowiÄ…zanie podklucza\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3788
 #, 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:3812
 #, 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:3825
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klucz %s: niepoprawne unieważnienie podklucza\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3840
 #, 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:3887
 #, 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:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klucz %s: podklucz pominięty\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klucz %s: dodano bezpośredni podpis\n"
@@ -4045,7 +4052,7 @@ msgstr[0] "%d powtórzony podpis usunięty\n"
 msgstr[1] "%d powtórzone podpisy usunięte\n"
 msgstr[2] "%d powtórzonych podpisów usuniętych\n"
 
-#: g10/key-check.c:726 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"
@@ -4053,7 +4060,7 @@ msgstr[0] "%d podpis nie został sprawdzony z powodu braku klucza\n"
 msgstr[1] "%d podpisy nie zostały sprawdzone z powodu braku klucza\n"
 msgstr[2] "%d podpisów nie zostało sprawdzonych z powodu braku klucza\n"
 
-#: g10/key-check.c:734 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"
@@ -4108,15 +4115,15 @@ msgstr "zasób bloku klucza ,,%s'': %s\n"
 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:262
 msgid "[revocation]"
 msgstr "[unieważnienie]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4127,17 +4134,17 @@ msgstr ""
 "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:389 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:390 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:408
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4147,52 +4154,52 @@ msgstr ""
 "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:425
 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:553
 #, 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:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr " Nie da się złożyć podpisu.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, 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:617
 #, 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:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Identyfikator użytkownika ,,%s'' jest podpisywalny. "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr "Podpisać go? (t/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4201,11 +4208,11 @@ msgstr ""
 "Podpis klucza nim samym na ,,%s''\n"
 "jest podpisem złożonym przez PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4214,11 +4221,11 @@ msgstr ""
 "Twój podpis na ,,%s''\n"
 "przekroczył datę ważności.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4227,45 +4234,45 @@ msgstr ""
 "Twój podpis na ,,%s''\n"
 "jest podpisem prywatnym (lokalnym).\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "Data ważności tego klucza upłynęła!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4274,31 +4281,31 @@ msgstr ""
 "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:874
 #, 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:876
 #, 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:878
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Pobieżnie.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:881
 #, 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:888
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Wybór (,,?'' podaje więcej informacji): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4307,243 +4314,243 @@ msgstr ""
 "Czy jesteś naprawdę pewien, że chcesz podpisać ten klucz\n"
 "swoim kluczem ,,%s'' (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 msgid "This will be a self-signature.\n"
 msgstr "To będzie podpis klucza nim samym.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 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:935
 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:945
 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:952
 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:959
 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:964
 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:969
 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:981
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisać? (t/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, 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:1120
 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:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "zapis zmian i wyjście"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 msgid "show key fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "show the keygrip"
 msgstr "okazanie uchwytu klucza"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikatorów użytkownika"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "wybór identyfikatora użytkownika N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr "wybór podklucza N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr "sprawdzenie podpisów"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 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:1286
 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:1287
 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:1289
 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:1291
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora użytkownika do klucza"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "dodanie zdjęcia użytkownika do klucza"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr "usunięcie wybranych identyfikatorów użytkownika z klucza"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr "dodanie klucza do karty procesorowej"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr "przeniesienie klucza na kartÄ™ procesorowÄ…"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr "przeniesienie klucza zapasowego na kartÄ™ procesorowÄ…"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 msgid "delete selected subkeys"
 msgstr "usunięcie wybranych podkluczy"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "dodanie klucza unieważniającego"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 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:1314
 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:1316
 msgid "flag the selected user ID as primary"
 msgstr "oznaczenie wybranego identyfikatora użytkownika jako głównego"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawień"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 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:1325
 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:1327
 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:1329
 msgid "change the passphrase"
 msgstr "zmiana hasła klucza"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "zmiana zaufania właściciela"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 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:1337
 msgid "revoke selected user IDs"
 msgstr "unieważnienie wybranych identyfikatorów użytkownika"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "revoke key or selected subkeys"
 msgstr "unieważnienie klucza lub wybranych podkluczy"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "enable key"
 msgstr "włączenie klucza do użycia"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr "wyłączenie klucza z użycia"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr "okazanie wybranych identyfikatorów - zdjęć"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 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:1349
 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:1470
 msgid "Secret key is available.\n"
 msgstr "Dostępny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 msgid "Secret subkeys are available.\n"
 msgstr "Dostępne są podklucze tajne.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1574
 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:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4556,289 +4563,273 @@ msgstr ""
 "(ltsign,\n"
 "  tnrsign itd.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "Klucz unieważniony."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 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:1682
 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:1690
 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:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Należy użyć polecenia ,,%s''.)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 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:1756
 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:1814 g10/keyedit.c:1854
 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 msgid "You must select exactly one key.\n"
 msgstr "Musisz wybrać dokładnie jeden klucz.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 msgid "Command expects a filename argument\n"
 msgstr "Polecenie oczekuje argumentu będącego nazwą pliku\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "Nie można otworzyć ,,%s'': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, 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:1969
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybrać co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1975
 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:1977
 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:2015
 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:2016
 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:2034
 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:2045
 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:2047
 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:2105
 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:2150
 msgid "Set preference list to:\n"
 msgstr "Ustawienie listy ustawień na:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 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:2159
 msgid "Really update the preferences? (y/N) "
 msgstr "Czy na pewno uaktualnić ustawienia? (t/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Save changes? (y/N) "
 msgstr "Zapisać zmiany? (t/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr "Wyjść bez zapisania zmian? (t/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, 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:2557
+#: g10/keyedit.c:2558
 #, 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:2583
+#: g10/keyedit.c:2584
 #, 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:2646
+#: g10/keyedit.c:2647
 #, 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:2677
+#: g10/keyedit.c:2717
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr ",,%s'' nie jest odciskiem\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr ",,%s'' nie jest głównym odciskiem\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Błędny identyfikator użytkownika ,,%s'': %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "No matching user IDs."
 msgstr "Brak pasującego identyfikatora użytkownika."
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "Nothing to sign.\n"
 msgstr "Nie ma nic do podpisania.\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Nie podpisane przez ciebie.\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "unieważnienie podpisu klucza nie powiodło się: %s\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3251
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr ",,%s'' nie jest poprawnym czasem wygaśnięcia\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr ",,%s'' nie jest właściwym odciskiem\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "podklucz ,,%s'' nie został odnaleziony\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr "AEAD: "
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Skrót: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Ustawienia: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr "no-modify dla serwera kluczy"
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Preferowany serwer kluczy: "
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr "(poufne)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "utworzono: %s"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr "unieważniono: %s"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr "wygasł: %s"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "wygasa: %s"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr "użycie: %s"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr "nr-karty: "
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr "zaufanie: %s"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr "poprawność: %s"
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Ten klucz został wyłączony z użytku"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4846,17 +4837,17 @@ msgstr ""
 "Pokazana wartość wiarygodności klucza może być niepoprawna,\n"
 "dopóki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "wygasł"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4866,17 +4857,17 @@ msgstr ""
 "             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:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "OSTRZEŻENIE: podklucz do szyfrowania wkrótce wygaśnie.\n"
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4885,37 +4876,37 @@ msgstr ""
 "OSTRZEŻENIE: To jest klucz PGP wersji 2. Dodanie zdjęcia spowoduje, że\n"
 "             niektóre wersje przestaną go rozumieć.\n"
 
-#: g10/keyedit.c:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je dodać? (t/N) "
 
-#: g10/keyedit.c:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 #, 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:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usunąć ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usunąć ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usunąć ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usunąć ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4923,20 +4914,20 @@ msgstr[0] "%d podpis usunięty.\n"
 msgstr[1] "%d podpisy usunięte.\n"
 msgstr[2] "%d podpisów usuniętych.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zostało usunięte.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "niepoprawny"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Identyfikator użytkownika ,,%s'' upakowany: %s\n"
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4944,17 +4935,17 @@ msgstr[0] "Identyfikator użytkownika ,,%s'': %d podpis usunięty\n"
 msgstr[1] "Identyfikator użytkownika ,,%s'': %d podpisy usunięte\n"
 msgstr[2] "Identyfikator użytkownika ,,%s'': %d podpisów usuniętych\n"
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Identyfikator użytkownika ,,%s'': już zmniejszony.\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Identyfikator użytkownika ,,%s'': już czysty.\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4964,215 +4955,215 @@ msgstr ""
 "             unieważniającego spowoduje, że niektóre wersje PGP przestaną\n"
 "             go rozumieć.\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza unieważniającego: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 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:4719
+#: g10/keyedit.c:4611
 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:4788
+#: g10/keyedit.c:4680
 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:4793
+#: g10/keyedit.c:4685
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty ważności podklucza.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty ważności głównego klucza.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 msgid "Changing usage of a subkey.\n"
 msgstr "Zmiana zastosowań podklucza.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 msgid "Changing usage of the primary key.\n"
 msgstr "Zmiana zastosowań klucza głównego.\n"
 
-#: g10/keyedit.c:5033
+#: g10/keyedit.c:4925
 #, 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:5039
+#: g10/keyedit.c:4931
 #, 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:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Proszę wybrać dokładnie jeden identyfikator użytkownika.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, 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:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr "Podaj preferowany URL serwera kluczy: "
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz go zastąpić? (t/N) "
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz go usunąć? (t/N) "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 msgid "Enter the notation: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 msgid "Proceed? (y/N) "
 msgstr "Kontynuować? (t/N) "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora użytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora użytkownika o skrócie %s\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Brak podklucza o identyfikatorze ,,%s''.\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak podklucza o numerze %d.\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "identyfikator użytkownika: ,,%s''\n"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ważność tego klucza wygasła %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go unieważnić? (t/N) "
 
-#: g10/keyedit.c:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzyć certyfikat unieważnienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr " (podpis nieunieważnialny) "
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, 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:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz unieważnić te podpisy:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzyć certyfikaty unieważnienia ? (t/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, 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:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator użytkownika ,,%s'' został już unieważniony\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, 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:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klucz %s jest już unieważniony.\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklucz %s jest już unieważniony.\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5215,33 +5206,33 @@ msgstr "zbyt wiele ustawień szyfru\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "niewłaściwy element ,,%s'' w tekście ustawień\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "zapis podpisu bezpośredniego\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "zapis podpisu klucza nim samym\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "zapis podpisu wiążącego klucz\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niewłaściwa długość klucza; wykorzystano %u bitów\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, 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:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5249,19 +5240,19 @@ msgstr ""
 "OSTRZEŻENIE: niektóre programy OpenPGP nie potrafią obsłużyć klucza RSA o "
 "tej długości skrótu\n"
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr "Podpisywanie"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr "Certyfikowanie"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr "Szyfrowanie"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr "Uwierzytelnianie"
 
@@ -5275,180 +5266,180 @@ msgstr "Uwierzytelnianie"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr "PpSsUuZz"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, 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:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr "Aktualnie dopuszczalne akcje: "
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Przełączenie możliwości podpisywania\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Przełączenie możliwości szyfrowania\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Przełączenie możliwości uwierzytelniania\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Zakończenie\n"
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, 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:2131
+#: g10/keygen.c:2108
 #, 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:2134
+#: g10/keygen.c:2111
 #, 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:2136
+#: g10/keygen.c:2113
 #, 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:2142
+#: g10/keygen.c:2119
 #, 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:2144
+#: g10/keygen.c:2121
 #, 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:2150
+#: g10/keygen.c:2127
 #, 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:2152
+#: g10/keygen.c:2129
 #, 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:2158
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid "   (%d) sign, encrypt\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) podpisywanie, szyfrowanie\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) ECC (tylko do podpisywania)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, 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:2163
+#: g10/keygen.c:2140
 #, 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:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) IstniejÄ…cy klucz\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, 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:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Uchwyt klucza: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Brak klucza o tym uchwycie\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Numer seryjny karty: %s\n"
 
-#: g10/keygen.c:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Dostępne klucze:\n"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "zaokrąglono do %u bitów\n"
 
-#: g10/keygen.c:2570
+#: g10/keygen.c:2547
 #, 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:2578
+#: g10/keygen.c:2555
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Jakiej długości podklucz wygenerować? (%u) "
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 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:2641
+#: g10/keygen.c:2618
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Proszę wybrać rodzaj krzywej eliptycznej:\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5464,7 +5455,7 @@ msgstr ""
 "      <n>m = termin ważności klucza upływa za n miesięcy\n"
 "      <n>y = termin ważności klucza upływa za n lat\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5480,38 +5471,38 @@ msgstr ""
 "      <n>m = termin ważności podpisu upływa za n miesięcy\n"
 "      <n>y = termin ważności podpisu upływa za n lat\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Okres ważności klucza? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Okres ważności podpisu? (%s) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "niepoprawna wartość\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr "Klucz nie wygaśnie w ogóle\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr "Podpis nie wygaśnie w ogóle\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Klucz traci ważność %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Ważność podpisu wygasa %s\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5519,11 +5510,11 @@ msgstr ""
 "Twój system nie potrafi pokazać daty po roku 2038.\n"
 "Niemniej daty do roku 2106 będą poprawnie obsługiwane.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr "Czy wszystko siÄ™ zgadza (t/N)? "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5537,7 +5528,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5553,41 +5544,41 @@ msgstr ""
 "    \"Tadeusz Żeleński (Boy) <tzb@ziemianska.pl>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "ImiÄ™ i nazwisko: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Niewłaściwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, 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:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Niewłaściwy znak w komentarzu\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Używany zestaw znaków: ,,%s''.\n"
 
-#: g10/keygen.c:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5598,13 +5589,13 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Taki identyfikator użytkownika już istnieje na tym kluczu!\n"
 
@@ -5619,35 +5610,35 @@ msgstr "Taki identyfikator użytkownika już istnieje na tym kluczu!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Zmienić (I)mię/nazwisko, adres (E)mail, czy (W)yjść? "
 
-#: g10/keygen.c:3148
+#: g10/keygen.c:3125
 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawić ten błąd\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5663,18 +5654,18 @@ msgstr ""
 "ilości\n"
 "entropii.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiodła się: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5685,66 +5676,66 @@ msgstr ""
 "    ,,%s''\n"
 "\n"
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr "Kontynuować? (T/n) "
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "klucz dla ,,%s'' już istnieje\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 msgid "Create anyway? (y/N) "
 msgstr "Utworzyć klucz mimo to? (t/N) "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, c-format
 msgid "creating anyway\n"
 msgstr "tworzenie mimo to\n"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, 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:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza została anulowana.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, 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:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "zapis klucza publicznego w ,,%s''\n"
 
-#: g10/keygen.c:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "błąd podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zostały utworzone i podpisane.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 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"
@@ -5752,7 +5743,7 @@ msgstr ""
 "Ten klucz nie może być wykorzystany do szyfrowania. Komendą \"--edit-key\"\n"
 "można dodać do niego podklucz szyfrujący.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5760,7 +5751,7 @@ msgstr ""
 "klucz został stworzony %lu sekundę w przyszłości (zaburzenia\n"
 "czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5768,23 +5759,23 @@ msgstr ""
 "klucz został stworzony %lu sekund w przyszłości (zaburzenia\n"
 "czasoprzestrzeni, lub źle ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzyć? (t/N) "
 
@@ -5792,27 +5783,43 @@ msgstr "Czy na pewno utworzyć? (t/N) "
 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"
@@ -5820,7 +5827,7 @@ msgstr[0] "%d poprawny podpis\n"
 msgstr[1] "%d poprawne podpisy\n"
 msgstr[2] "%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"
@@ -5828,7 +5835,7 @@ msgstr[0] "%d podpis nie został sprawdzony z powodu błędu\n"
 msgstr[1] "%d podpisy nie został sprawdzone z powodu błędu\n"
 msgstr[2] "%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"
@@ -5836,33 +5843,33 @@ msgstr[0] "Ostrzeżenie: %lu klucz pominięto z powodu dużego rozmiaru\n"
 msgstr[1] "Ostrzeżenie: %lu klucze pominięto z powodu dużego rozmiaru\n"
 msgstr[2] "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:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Odcisk klucza głównego:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr " Odcisk klucza głównego:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "       Odcisk podklucza:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr "       Odcisk klucza ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr "    Nr seryjny karty ="
 
@@ -6239,7 +6246,7 @@ msgstr "binarny"
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "nieznany"
 
@@ -6384,28 +6391,28 @@ msgstr "Nieskompresowany"
 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:1614
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "niejednoznaczna opcja ,,%s''\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "nieznany słaby skrót ,,%s''\n"
@@ -6526,7 +6533,7 @@ msgstr ""
 "utworzony %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6540,78 +6547,78 @@ msgstr ""
 "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:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Nazwa pliku ze zdjęciem w formacie JPEG: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, 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:239
 #, 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:241
 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:257
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr ",,%s'' nie jest plikiem JPEG\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:276
 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:421
 #, 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:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, 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:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, 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:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "nie można wyświetlić zdjęcia!\n"
@@ -6933,12 +6940,12 @@ msgstr "nieznany domyślny adresat ,,%s''\n"
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adresatów\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Uwaga: klucz %s nie ma cechy %s\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Uwaga: klucz %s nie ma preferencji dla %s\n"
@@ -8044,7 +8051,7 @@ msgstr "użycie modelu zaufania %s\n"
 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"
@@ -8074,7 +8081,7 @@ msgstr "należy uruchomić gpg z opcją ,,--check-trustdb''\n"
 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"
@@ -8082,7 +8089,7 @@ msgstr[0] "przetworzono %d klucz"
 msgstr[1] "przetworzono %d klucze"
 msgstr[2] "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"
@@ -8090,17 +8097,17 @@ msgstr[0] " (skasowano %d licznik zaufania)\n"
 msgstr[1] " (skasowano %d liczniki zaufania)\n"
 msgstr[2] " (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"
@@ -8108,7 +8115,7 @@ msgstr ""
 "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 ""
@@ -8235,7 +8242,7 @@ msgstr ""
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8243,7 +8250,7 @@ msgstr "%sNumer: %s%%0AWłaściciel: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8285,7 +8292,7 @@ msgstr "|A|Proszę wprowadzić PIN administracyjny"
 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:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8373,62 +8380,62 @@ msgstr[2] "generowanie klucza zakończone (%d sekund)\n"
 msgid "response does not contain the public key data\n"
 msgstr "odpowiedź nie zawiera danych klucza publicznego\n"
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Proszę wprowadzić PIN administracyjny"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 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:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, 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:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, 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:1654
+#: 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:1701
+#: 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:2074
+#: 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:2082
+#: 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:2092
+#: 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:2102
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8436,7 +8443,7 @@ msgstr ""
 "|NP|Proszę wprowadzić nowy kod odblokowujący PIN (PUK) dla klucza do "
 "tworzenia podpisów kwalifikowanych."
 
-#: scd/app-nks.c:2104
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8444,7 +8451,7 @@ msgstr ""
 "|P|Proszę wprowadzić kod odblokowujący PIN (PUK) dla klucza do tworzenia "
 "podpisów kwalifikowanych."
 
-#: scd/app-nks.c:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "błąd podczas odczytu nowego PIN-u: %s\n"
@@ -8706,13 +8713,13 @@ msgstr "obsługa fd %d uruchomiona\n"
 msgid "handler for fd %d terminated\n"
 msgstr "obsługa fd %d zakończona\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8721,11 +8728,11 @@ msgstr ""
 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:199 sm/certchain.c:2211
 msgid "chain"
 msgstr "łańcuchowy"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 msgid "shell"
 msgstr "powłokowy"
 
@@ -8748,236 +8755,236 @@ msgstr "polityka oznaczona jako krytyczna bez skonfigurowanych polityk"
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "nie udało się pobrać odcisku\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "poszukiwanie wystawcy na zewnÄ…trz\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "liczba pasujących wystawców: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, 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:818
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "liczba pasujących certyfikatów: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, 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:1260 sm/certchain.c:1264
 msgid "certificate has been revoked"
 msgstr "certyfikat został unieważniony"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr "status certyfikatu jest nieznany"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, 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:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, 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:1337 sm/certchain.c:1422
 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:1338 sm/certchain.c:1423
 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:1351 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr "certyfikat wygasł"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 msgid "root certificate has expired"
 msgstr "certyfikat główny wygasł"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 msgid "intermediate certificate has expired"
 msgstr "certyfikat pośredni wygasł"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, 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:1404
 msgid "certificate with invalid validity"
 msgstr "certyfikat o nieważnej ważności"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr "podpis nie utworzony w czasie życia certyfikatu"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr "certyfikat nie utworzony w czasie życia wystawcy"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 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:1448
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  podpis utworzony "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certyfikat utworzony "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certyfikat ważny od "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     wystawca ważny od "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "odcisk=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, 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:1505
 #, 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:1511
 #, 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:1570
 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:1634
 msgid "no issuer found in certificate"
 msgstr "nie znaleziono wystawcy w certyfikacie"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 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:1785 dirmngr/validate.c:576
 #, 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:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, 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:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr "nie znaleziono certyfikatu wystawcy"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, 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:1911 dirmngr/validate.c:693
 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:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr "certyfikat jest dobry\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "certyfikat pośredni jest dobry\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, c-format
 msgid "root certificate is good\n"
 msgstr "certyfikat główny jest dobry\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr "przełączanie do modelu łańcuchowego"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr "użyty model poprawności: %s"
@@ -9000,7 +9007,7 @@ msgstr "brak pamięci\n"
 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:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "brak"
 
@@ -9034,42 +9041,42 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "stworzony %s, wygasa %s.\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "nie podano zastosowania klucza - przyjęto wszystkie zastosowania\n"
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, 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:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, 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:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, 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:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, 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:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certyfikat nie nadaje siÄ™ do szyfrowania\n"
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certyfikat nie nadaje siÄ™ do podpisywania\n"
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9627,7 +9634,7 @@ msgstr "algorytm skrótu użyty dla podpisującego %d: %s (%s)\n"
 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:916
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
@@ -9819,7 +9826,7 @@ msgstr "usuwanie pliku pamięci podręcznej ,,%s''\n"
 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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "błąd zamykania pliku pamięci podręcznej: %s\n"
@@ -10075,136 +10082,136 @@ msgstr "niewłaściwy algorytm skrótu ,,%s''\n"
 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:1849 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:1923
 #, 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:1938
 #, 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:1945
 #, 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:1949
 #, 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:1969
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "błąd pobierania elementu CRL: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1984
 #, 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:2011
 #, 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:2026
 #, 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:2072
 #, 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:2084
 #, 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:2226
 #, 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:2233
 #, 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:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, 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:2301
 #, 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:2308
 #, 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:2333
 #, 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:2337
 #, 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:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "nieznane rozszerzenie krytyczne CRL %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "błąd odczytu rozszerzeń CRL: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2414
 #, 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:2446
 #, 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:2460
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10213,12 +10220,12 @@ msgstr ""
 "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:2497
 #, 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:2520
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10226,55 +10233,55 @@ msgstr ""
 " B�ĄD: CRL nie będzie użyte, ponieważ po uaktualnieniu jest nadal zbyt "
 "stare!\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2523
 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:2526
 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:2533
 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:2551
 #, 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:2558
 #, 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:2569
 #, 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:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr "Koniec zrzutu CRL\n"
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "crl_fetch po DP nie powiodło się: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, 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:2779
+#: dirmngr/crlcache.c:2780
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "crl_cache_insert po wystawcy nie powiodło się: %s\n"
@@ -10624,12 +10631,12 @@ msgstr "składnia: %s [opcje]"
 msgid "colons are not allowed in the socket name\n"
 msgstr "dwukropki nie sÄ… dozwolone w nazwie gniazda\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "pobranie CRL z ,,%s'' nie powiodło się: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "przetworzenie CRL z ,,%s'' nie powiodło się: %s\n"
@@ -10876,92 +10883,92 @@ msgstr "liczenie skrótu odpowiedzi OCSP dla ,,%s'' nie powiodło się: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "nie podpisane domyślnym certyfikatem podpisującego OCSP"
 
-#: dirmngr/ocsp.c:582
+#: 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:598 dirmngr/ocsp.c:782
+#: 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:642
+#: 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:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "nie znaleziono certyfikatu wystawcy: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: 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:698
+#: 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:708
+#: 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:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "nie zdefiniowano domyślnego respondera OCSP\n"
 
-#: dirmngr/ocsp.c:753
+#: 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:760
+#: 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:765
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "użycie respondera OCSP ,,%s''\n"
 
-#: dirmngr/ocsp.c:822
+#: 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:847
+#: 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:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "poprawny"
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: 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:901
+#: 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:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "responder OCSP zwrócił stan zbyt stary\n"
@@ -10975,63 +10982,63 @@ msgstr "assuan_inquire(%s) nie powiodło się: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire nie powiodło się: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "błąd wysyłania danych: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, 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:1776
 #, 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:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "przekroczono max_replies %d\n"
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "nie można przydzielić struktury sterującej: %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "nie udało się przydzielić kontekstu assuan: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "nie udało się zainicjować serwera: %s\n"
 
-#: dirmngr/server.c:3062
+#: dirmngr/server.c:3078
 #, 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:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Problem z accept u Assuana: %s\n"
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Przetwarzanie u Assuana nie powiodło się: %s\n"
@@ -11342,90 +11349,105 @@ msgstr ""
 "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:2421
+#: 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:2424
+#: 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:2427
+#: 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:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: 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:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "ustawienie KDF do uwierzytelniania PIN-em"
 
-#: tools/gpg-card.c:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3707
+#: 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:3708
+#: 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:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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"
 
diff --git a/po/pt.gmo b/po/pt.gmo
index 2183681..515394a 100644
--- a/po/pt.gmo
+++ b/po/pt.gmo
diff --git a/po/pt.po b/po/pt.po
index e75cbaa..1ac153a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2015-02-11 19:17+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -143,8 +143,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "frase secreta incorrecta"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
@@ -198,25 +198,25 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, 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:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, 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:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -227,26 +227,26 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -257,39 +257,39 @@ msgstr "impossível abrir `%s': %s\n"
 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:2467
+#: agent/command-ssh.c:2472
 #, 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:2777
+#: agent/command-ssh.c:2782
 #, 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:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, 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:3797
+#: agent/command-ssh.c:3837
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: falha ao criar tabela de dispersão: %s\n"
@@ -420,76 +420,76 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizar a base de dados de confiança"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
@@ -497,133 +497,139 @@ msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "não suportado"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "não suportado"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "não suportado"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|usar mode de frase secreta N"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "utilizar o gpg-agent"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
@@ -631,148 +637,148 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:570
+#: agent/gpg-agent.c:582
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado é inválido\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, 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:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, 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:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, 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:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, fuzzy, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: agent/gpg-agent.c:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, 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:2406
+#: agent/gpg-agent.c:2427
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2853
+#: agent/gpg-agent.c:2967
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignorado: %s\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1034,7 +1040,7 @@ msgstr "verificação da assinatura criada falhou: %s\n"
 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:1602
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1052,52 +1058,52 @@ msgstr "algoritmo de protecção %d%s não é suportado\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1128,18 +1134,18 @@ msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "actualização falhou: %s\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 #, fuzzy
 msgid "yes"
 msgstr "sim"
@@ -1195,8 +1201,8 @@ msgstr ""
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1216,69 +1222,69 @@ msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 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:432 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"
@@ -1446,12 +1452,12 @@ msgstr "Esta chave expirou!"
 msgid "Root certificate trustworthy"
 msgstr "certificado incorrecto"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificado incorrecto"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Nenhuma ajuda disponível"
@@ -1493,7 +1499,7 @@ msgstr "Nenhuma ajuda disponível para `%s'"
 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"
@@ -1538,36 +1544,36 @@ msgstr "impossível abrir %s: %s\n"
 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
 #, 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"
@@ -1577,92 +1583,92 @@ msgstr "a escrever chave privada para `%s'\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: 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"
@@ -1670,13 +1676,13 @@ msgstr ""
 "caracter \"quoted printable\" na armadura - provavelmente um MTA com bugs "
 "foi usado\n"
 
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, 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:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1685,27 +1691,27 @@ msgstr ""
 "um nome de notação deve ter apenas caracteres imprimíveis ou espaços, e "
 "terminar com um '='\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, 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:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1715,7 +1721,7 @@ msgstr ""
 "um nome de notação deve ter apenas caracteres imprimíveis ou espaços, e "
 "terminar com um '='\n"
 
-#: g10/build-packet.c:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVISO: dados de notação inválidos encontrados\n"
@@ -1729,7 +1735,7 @@ msgstr ""
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 g10/sign.c:473
 #: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, fuzzy, c-format
 msgid "%s is not compliant with %s mode\n"
@@ -1746,7 +1752,7 @@ msgstr "erro na leitura de `%s': %s\n"
 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:2330
+#: 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"
@@ -1789,177 +1795,177 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1500
+#: g10/card-util.c:803 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1502
+#: g10/card-util.c:805 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferências actualizadas"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 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:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra impressão digital"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP válido encontrado.\n"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -1967,102 +1973,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 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:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Opção inválida.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2070,197 +2076,197 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 #, 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:1743 g10/card-util.c:1833
 #, 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:1744 g10/card-util.c:1835
 #, 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:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "motivo da revocação: "
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1876
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 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:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3689
+#: g10/card-util.c:2262 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3690
+#: g10/card-util.c:2263 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:3691
+#: g10/card-util.c:2264 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:3692
+#: g10/card-util.c:2265 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3694
+#: g10/card-util.c:2267 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:3695
+#: g10/card-util.c:2268 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3696
+#: g10/card-util.c:2269 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:3697
+#: g10/card-util.c:2270 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3698
+#: g10/card-util.c:2271 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 #, 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:2276
 #, 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:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 #, 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output não funciona para este comando\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2322,9 +2328,9 @@ msgstr "key"
 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:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualização falhou: %s\n"
@@ -2356,18 +2362,18 @@ msgid ""
 msgstr ""
 "ao forçar a cifra simétrica %s (%d) viola as preferências do destinatário\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, 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"
@@ -2377,46 +2383,47 @@ msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 
-#: g10/encrypt.c:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 msgid "using cipher %s.%s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "%s' já comprimido\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, 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:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, 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:862
+#: g10/encrypt.c:853
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2425,13 +2432,13 @@ msgstr ""
 "ao forçar o algoritmo de compressão %s (%d) viola as preferências do "
 "destinatário\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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,68 +2467,79 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2590,7 +2608,7 @@ msgstr "Chave inválida %08lX tornada válida por --allow-non-selfsigned-uid\n"
 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:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opções de importação inválidas\n"
@@ -2674,120 +2692,120 @@ msgstr "gerar um novo par de chaves"
 msgid "quickly set a new expiration date"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves público"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confiança"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omissão"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
@@ -2803,58 +2821,58 @@ msgstr "não fazer alterações"
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrepôr"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "criar saída com armadura ascii"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "usar modo de texto canônico"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 #, 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:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 #, 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:781
+#: g10/gpg.c:780
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2884,7 +2902,7 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2892,7 +2910,7 @@ msgstr ""
 "@\n"
 "(Veja a página man para uma lista completa de comandos e opções)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2922,13 +2940,13 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impressões digitais\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 #, 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:1175
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2943,7 +2961,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a operação por omissão depende dos dados de entrada\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2951,570 +2969,559 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Chave pública: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Dispersão: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Compressão: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uso: gpg [opções] "
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, 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:1708
+#: g10/gpg.c:1698
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, 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:1726
+#: g10/gpg.c:1716
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, 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:1735
+#: g10/gpg.c:1725
 #, 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:1738
+#: g10/gpg.c:1728
 #, 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:1744
+#: g10/gpg.c:1734
 #, 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:1747
+#: g10/gpg.c:1737
 #, 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:1750
+#: g10/gpg.c:1740
 #, 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:1966
+#: g10/gpg.c:1956
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "criado um novo ficheiro de configuração `%s'\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de política de assinatura dada é inválida\n"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave está"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "configurar lista de preferências"
+
+#: g10/gpg.c:2197
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, 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:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, 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:3220
+#: g10/gpg.c:3194
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Endereço eletrónico inválido\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, 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:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, 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:3355
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opções de importação inválidas\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opções de importação inválidas\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de política de assinatura dada é inválida\n"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 #, 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:3431
+#: g10/gpg.c:3407
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, 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:3648
+#: g10/gpg.c:3621
 #, 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:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrepõe %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, 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:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado é inválido\n"
 
-#: g10/gpg.c:3952
-#, 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:3964
+#: g10/gpg.c:3927
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado é inválido\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, 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:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferências por omissão inválidas\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferências pessoais de cifra inválidas\n"
 
-#: g10/gpg.c:4015
-#, 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:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferências pessoais de 'digest' inválidas\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferências pessoais de compressão inválidas\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, 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:4074
+#: g10/gpg.c:4034
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, 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:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 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:4886
+#: g10/gpg.c:4842
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, fuzzy, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4928
+#: g10/gpg.c:4884
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, 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:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, 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:5726
+#: g10/gpg.c:5682
 #, 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:5759
+#: g10/gpg.c:5715
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de política de assinatura dada é inválida\n"
@@ -3529,7 +3536,7 @@ msgstr "Remover esta chave do porta-chaves?"
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 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"
@@ -3560,335 +3567,335 @@ msgstr "Nenhuma ajuda disponível"
 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:1998 g10/import.c:3146
 #, 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:2004
 #, fuzzy, c-format
 msgid "key %s: %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, 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:2801
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
@@ -3901,204 +3908,204 @@ msgstr "erro ao enviar para `%s': %s\n"
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, 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:3138 g10/import.c:3177
 #, 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:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "motivo da revocação: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "comentário da revocação: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, 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:3788
 #, 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:3812
 #, 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:3825
 #, 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:3840
 #, 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:3887
 #, 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:3914
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
@@ -4136,7 +4143,7 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "Utilizador \"%s\" está revocado."
 msgstr[1] "Utilizador \"%s\" está revocado."
 
-#: g10/key-check.c:726 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"
@@ -4144,7 +4151,7 @@ msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr[0] "1 assinatura não verificada por falta de chave\n"
 msgstr[1] "1 assinatura não verificada por falta de chave\n"
 
-#: g10/key-check.c:734 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"
@@ -4198,15 +4205,15 @@ msgstr "erro ao criar `%s': %s\n"
 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:262
 msgid "[revocation]"
 msgstr "[revogação]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4219,68 +4226,68 @@ msgstr ""
 "(vendo passaportes, verificando impressões digitais...)?\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 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:390 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:408
 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:425
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  Não foi possível assinar.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, fuzzy, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Utilizador \"%s\" está revocado."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, 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:646
 #, 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:648
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4289,11 +4296,11 @@ msgstr ""
 "A sua auto-assinatura em \"%s\"\n"
 "é uma assinatura do tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, fuzzy, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4302,12 +4309,12 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "é uma assinatura local.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 #, 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4316,44 +4323,44 @@ msgstr ""
 "A sua assinatura actual em \"%s\"\n"
 "é uma assinatura local.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 #, 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "Esta chave expirou!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4363,32 +4370,32 @@ msgstr ""
 "pertence\n"
 "à pessoa correcta? Se não sabe o que responder, escolha \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, 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:876
 #, 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:878
 #, 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:881
 #, 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:888
 #, fuzzy
 msgid "Your selection? (enter '?' for more information): "
 msgstr " i = mostrar mais informações\n"
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4397,278 +4404,278 @@ msgstr ""
 "Você tem certeza de que quer assinar esta chave com\n"
 "a sua chave: \""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, fuzzy
 msgid "This will be a self-signature.\n"
 msgstr ""
 "\n"
 "Isto será uma auto-assinatura.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 #, 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:935
 #, 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:945
 #, 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:952
 #, 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:959
 #, 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:964
 #, fuzzy
 msgid "I have checked this key casually.\n"
 msgstr ""
 "\n"
 "Verifiquei por alto esta chave.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 #, 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:981
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impressão digital"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Notação de assinatura: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, 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:1289
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotográfico"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de utilizador"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secundária"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "adiciona uma chave de revocação"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 #, 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:1314
 #, 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:1316
 #, 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:1319
 msgid "list preferences (expert)"
 msgstr "lista preferências (perito)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "lista preferências (detalhadamente)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 #, 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:1325
 #, 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:1327
 #, 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:1329
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "muda os valores de confiança"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 #, 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:1337
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar um ID de utilizador"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secundária"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 #, fuzzy
 msgid "enable key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostrar identificador fotográfico"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1349
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1470
 msgid "Secret key is available.\n"
 msgstr "Chave secreta disponível.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 #, 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:1574
 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:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4676,310 +4683,294 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "A chave está revogada."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 #, 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:1682
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1690
 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:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 #, 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:1756
 #, 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:1814 g10/keyedit.c:1854
 #, 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 #, 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:1894
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, fuzzy, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "impossível abrir `%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, 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:1969
 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:1975
 #, 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:1977
 #, 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:2015
 #, 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:2016
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente revocar este ID de utilizador? "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2034
 #, 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:2045
 #, 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:2047
 #, 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:2105
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2150
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "configurar lista de preferências"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 #, 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:2159
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente actualizar as preferências?"
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gravar alterações? "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, 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:2557
+#: g10/keyedit.c:2558
 #, 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:2583
+#: g10/keyedit.c:2584
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: g10/keyedit.c:2677
+#: g10/keyedit.c:2717
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, 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:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "valor inválido\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   assinado por %08lX em %s%s\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, 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:3211
+#: g10/keyedit.c:3251
 #, 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:3253
+#: g10/keyedit.c:3293
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "'Digest': "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Características: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 #, fuzzy
 msgid "Notations: "
 msgstr "Notação: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensível)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossível criar %s: %s\n"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4987,37 +4978,37 @@ msgstr ""
 "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:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, 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:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5026,36 +5017,36 @@ msgstr ""
 "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:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 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:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura válida? (s/N/q)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inválida? (s/N/q)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5063,38 +5054,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d assinatura removida.\n"
 msgstr[1] "%d assinatura removida.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inválida"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Utilizador \"%s\" está revocado."
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Utilizador \"%s\" está revocado."
 msgstr[1] "Utilizador \"%s\" está revocado."
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5103,223 +5094,223 @@ msgstr ""
 "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:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 #, 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:4719
+#: g10/keyedit.c:4611
 #, 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:4788
+#: g10/keyedit.c:4680
 #, 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:4793
+#: g10/keyedit.c:4685
 #, 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:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 #, 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:5033
+#: g10/keyedit.c:4925
 #, 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:5039
+#: g10/keyedit.c:4931
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, 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:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 #, 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:5451
+#: g10/keyedit.c:5345
 #, 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:5516
+#: g10/keyedit.c:5410
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notação de assinatura: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr "  (não-exportável)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 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:6078
+#: g10/keyedit.c:5972
 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:6138
+#: g10/keyedit.c:6032
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:6167
+#: g10/keyedit.c:6061
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (não-exportável)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revogação? (s/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, 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:6464
+#: g10/keyedit.c:6358
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5360,53 +5351,53 @@ msgstr "demasiadas preferências `%c'\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "caracter inválido na cadeia de caractéres da preferência\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "a escrever a assinatura directa\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "a escrever a auto-assinatura\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "a escrever a assinatura ligada a uma chave\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inválido; a utilizar %u bits\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 #, fuzzy
 msgid "Encrypt"
 msgstr "cifrar dados"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr ""
 
@@ -5420,180 +5411,180 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA e ElGamal (por omissão)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA e ElGamal (por omissão)\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, 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:2136
+#: g10/keygen.c:2113
 #, 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:2142
+#: g10/keygen.c:2119
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (apenas cifragem)\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, 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:2150
+#: g10/keygen.c:2127
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, 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:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr " (por omissão)"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, 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:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notação de assinatura: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 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:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 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:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "desactiva uma chave"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, 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:2570
+#: g10/keygen.c:2547
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2555
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Qual o tamanho de chave desejado? (1024) "
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 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:2641
+#: g10/keygen.c:2618
 #, 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:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5609,7 +5600,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5625,40 +5616,40 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "A chave é valida por? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A assinatura é valida por? (0) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "valor inválido\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A %s não expira nunca\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A %s não expira nunca\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5666,12 +5657,12 @@ msgstr ""
 "O seu sistema não consegue mostrar datas para além de 2038.\n"
 "No entanto, estas vão ser tratadas correctamente até 2106.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Está correto (s/n)? "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5682,7 +5673,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 #, fuzzy
 msgid ""
 "\n"
@@ -5700,42 +5691,42 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Caracter inválido no nome\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "Endereço de correio eletrónico: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Endereço eletrónico inválido\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Comentário: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Caracter inválido no comentário\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, 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:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5746,13 +5737,13 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5767,35 +5758,35 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 #, 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:3148
+#: g10/keygen.c:3125
 #, 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5807,18 +5798,18 @@ msgstr ""
 "geração dos números primos; isso dá ao gerador de números aleatórios\n"
 "uma hipótese maior de ganhar entropia suficiente.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5826,69 +5817,69 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "%s' já comprimido\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Criar mesmo assim?"
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Criar mesmo assim?"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Geração de chave cancelada.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "impossível criar `%s': %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, 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:5599
+#: g10/keygen.c:5570
 #, 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:5613
+#: g10/keygen.c:5584
 #, 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:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "chaves pública e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5897,7 +5888,7 @@ msgstr ""
 "Note que esta chave não pode ser usada para cifragem. Você pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secundária para esse fim.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5905,7 +5896,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5913,23 +5904,23 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no relógio)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
@@ -5938,27 +5929,43 @@ msgstr "Realmente criar? "
 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"
@@ -5966,7 +5973,7 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d assinaturas incorrectas\n"
 msgstr[1] "%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"
@@ -5974,41 +5981,41 @@ msgid_plural "%d signatures not checked due to errors\n"
 msgstr[0] "1 assinatura não verificada devido a um erro\n"
 msgstr[1] "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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Porta-chaves"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Impressão da chave primária:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr "Impressão da chave primária:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "      Impressão da subchave:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "  Impressão da chave ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -6383,7 +6390,7 @@ msgstr "primary"
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 #, fuzzy
 msgid "unknown"
 msgstr "versão desconhecida"
@@ -6527,27 +6534,27 @@ msgstr "não processado"
 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:1614
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "a ler opções de `%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "classe de assinatura desconhecida"
@@ -6668,7 +6675,7 @@ msgid ""
 "%s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6677,77 +6684,77 @@ msgid ""
 "Keeping the image close to 240x288 is a good size to use.\n"
 msgstr ""
 
-#: g10/photoid.c:100
+#: g10/photoid.c:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr ""
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, 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:239
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:241
 #, 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:257
 #, 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:276
 #, fuzzy
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Está correto (s/n)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr ""
 
-#: g10/photoid.c:486
+#: g10/photoid.c:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr ""
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr ""
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, fuzzy, c-format
 msgid "unable to display photo ID!\n"
 msgstr "não foi possível alterar o exec-path para %s\n"
@@ -7078,12 +7085,12 @@ msgstr "destinatário por omissão desconhecido `%s'\n"
 msgid "no valid addressees\n"
 msgstr "nenhum endereço válido\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, fuzzy, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
@@ -8132,7 +8139,7 @@ msgstr ""
 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"
@@ -8162,39 +8169,39 @@ msgstr ""
 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"
 msgstr[0] "%lu chaves processadas até agora\n"
 msgstr[1] "%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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: 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"
@@ -8321,7 +8328,7 @@ msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8329,7 +8336,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8365,7 +8372,7 @@ msgstr "muda a frase secreta"
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "motivo da revocação: "
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8451,75 +8458,75 @@ msgstr[1] "A geração de chaves falhou: %s\n"
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muda a frase secreta"
 
-#: scd/app-nks.c:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1654
+#: 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:1701
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2074
+#: 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:2082
+#: 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:2092
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2102
+#: 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:2104
+#: 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:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 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"
@@ -8784,13 +8791,13 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8799,11 +8806,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:199 sm/certchain.c:2211
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -8827,241 +8834,241 @@ msgstr ""
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, 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:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:818
 #, 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:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, 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:1260 sm/certchain.c:1264
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTA: a chave foi revogada"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 #, 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:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1404
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Esta chave expirou!"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "        novas assinaturas: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "chave %08lX: certificado de revogação \"%s\" adicionado\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "certificado incorrecto"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "mostra impressão digital"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1505
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1511
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "gerar um certificado de revogação"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verificar uma assinatura"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1911 dirmngr/validate.c:693
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "preferência %c%lu duplicada\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, 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:2014
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "certificado incorrecto"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9084,7 +9091,7 @@ msgstr "não processado"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "não"
@@ -9122,42 +9129,42 @@ msgstr ""
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "certificado incorrecto"
@@ -9720,7 +9727,7 @@ msgstr ""
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
@@ -9913,7 +9920,7 @@ msgstr "remoção do bloco de chave falhou: %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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -10163,201 +10170,201 @@ msgstr "algoritmo de dispersão inválido `%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1849 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:1923
 #, fuzzy, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1938
 #, 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:1945
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, 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:1984
 #, 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:2011
 #, 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:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, 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:2084
 #, 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:2226
 #, 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:2233
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, 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:2301
 #, 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:2308
 #, 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:2333
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, 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:2414
 #, 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:2446
 #, 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:2460
 #, 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:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 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:2523
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, 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:2558
 #, 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:2569
 #, 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:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "actualização falhou: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
@@ -10719,12 +10726,12 @@ msgstr "uso: gpg [opções] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
@@ -10972,92 +10979,92 @@ msgstr "verificação da assinatura criada falhou: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:582
+#: 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:598 dirmngr/ocsp.c:782
+#: 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:642
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:698
+#: 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:708
+#: 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:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:753
+#: 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:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:765
+#: dirmngr/ocsp.c:777
 #, fuzzy, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "assinatura falhou: %s\n"
 
-#: dirmngr/ocsp.c:822
+#: 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:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11071,64 +11078,64 @@ msgstr "assinatura falhou: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, 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:1776
 #, 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:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "impossível criar `%s': %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, 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:3054
+#: dirmngr/server.c:3070
 #, 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:3062
+#: dirmngr/server.c:3078
 #, 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:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11447,87 +11454,101 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: 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:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: 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:3706
+#: 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:3707
+#: 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:3708
+#: 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:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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 "
@@ -13108,9 +13129,6 @@ msgstr ""
 #~ msgid "delete signatures"
 #~ msgstr "remove assinaturas"
 
-#~ msgid "set preference list"
-#~ msgstr "configurar lista de preferências"
-
 #~ msgid "updated preferences"
 #~ msgstr "preferências actualizadas"
 
diff --git a/po/ro.gmo b/po/ro.gmo
index b2a55ac..24f846e 100644
--- a/po/ro.gmo
+++ b/po/ro.gmo
diff --git a/po/ro.po b/po/ro.po
index ecee6b6..883718b 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2017-12-19 12:30+0100\n"
 "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -147,8 +147,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "frază-parolă incorectă"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
@@ -202,18 +202,18 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, 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:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -221,7 +221,7 @@ msgid ""
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -232,26 +232,26 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -262,33 +262,33 @@ msgstr "nu pot deschide `%s': %s\n"
 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:2467
+#: agent/command-ssh.c:2472
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, 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:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -296,7 +296,7 @@ msgid ""
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/command-ssh.c:3797
+#: agent/command-ssh.c:3837
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: am eşuat să creez hashtable: %s\n"
@@ -427,208 +427,214 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "locvace"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai tăcut"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizează baza de date de încredere"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 #, 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:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "nu este suportat(ă)"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "nu este suportat(ă)"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "nu este suportat(ă)"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|foloseşte modul frază-parolă N"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "foloseÅŸte gpg-agent"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
@@ -636,150 +642,150 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Raportaţi bug-uri la <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:570
+#: agent/gpg-agent.c:582
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, 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:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, 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:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "scriu cheia secretă în `%s'\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, 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:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: 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:2402
+#: agent/gpg-agent.c:2423
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "fstat(%d) a eşuat în %s: %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: nu pot crea director: %s\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2853
+#: agent/gpg-agent.c:2967
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "actualizarea secretului a eÅŸuat: %s\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: sărită: %s\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1049,7 +1055,7 @@ msgstr "verificarea semnăturii create a eşuat: %s\n"
 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:1602
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1067,52 +1073,52 @@ msgstr "algoritm de protecţie %d%s nu este suportat\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1143,19 +1149,19 @@ msgstr "AVERTISMENT: proprietate nesigură (unsafe) pentru extensia `%s'\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "actualizarea a eÅŸuat: %s\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "da"
 
@@ -1209,8 +1215,8 @@ msgstr ""
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1230,73 +1236,73 @@ msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
 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:432 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"
@@ -1465,12 +1471,12 @@ msgstr "Această cheie a expirat!"
 msgid "Root certificate trustworthy"
 msgstr "certificat incorect"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "certificat incorect"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Cheie disponibilă la: "
@@ -1512,7 +1518,7 @@ msgstr "Nici un disponibil disponibil pentru `%s'"
 msgid "ignoring garbage line"
 msgstr "eroare linia de trailer\n"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 #, fuzzy
 msgid "[none]"
 msgstr "[nesetat(ă)]"
@@ -1557,36 +1563,36 @@ msgstr "nu pot deschide fiÅŸierul: %s\n"
 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
 #, 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"
@@ -1596,92 +1602,92 @@ msgstr "scriu cheia secretă în `%s'\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: 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"
@@ -1689,13 +1695,13 @@ msgstr ""
 "caracter printabil în ghilimele în armură - probabil a fost folosit un MTA "
 "cu bug-uri\n"
 
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "ilizibil"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1704,29 +1710,29 @@ msgstr ""
 "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:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, 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:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1736,7 +1742,7 @@ msgstr ""
 "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:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "AVERTISMENT: am găsit date de notare invalide\n"
@@ -1750,7 +1756,7 @@ msgstr ""
 msgid "Enter passphrase: "
 msgstr "Introduceţi fraza-parolă: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 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"
@@ -1768,7 +1774,7 @@ msgstr "eroare la citire `%s': %s\n"
 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:2330
+#: 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"
@@ -1813,171 +1819,171 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "generează un certificat de revocare"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "forţat(ă)"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 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:1500
+#: g10/card-util.c:803 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:1502
+#: g10/card-util.c:805 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:1535
+#: g10/card-util.c:823 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:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Prenumele proprietarului cardului: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Date login (nume cont): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Date DO personale: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Preferinţe limbă: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 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:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "Amprenta CA: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 msgid "not an OpenPGP card"
 msgstr "nu este un card OpenPGP"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr "Înlocuiesc cheia existentă? (d/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -1985,107 +1991,107 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 #, 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:1474
 #, 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:1476
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 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:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Selecţie invalidă.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 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:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, fuzzy, c-format
 #| msgid ""
 #| "Please note that the factory settings of the PINs are\n"
@@ -2100,187 +2106,187 @@ msgstr ""
 "   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:1741
 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:1743 g10/card-util.c:1833
 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:1744 g10/card-util.c:1835
 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:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 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:1876
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "actualizarea a eÅŸuat: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "ieÅŸi din acest meniu"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr "arată comenzi administrare"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "afişează acest mesaj"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 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:3687
+#: g10/card-util.c:2260 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:3688
+#: g10/card-util.c:2261 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:3689
+#: g10/card-util.c:2262 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:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "schimbă numele de login"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 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:3692
+#: g10/card-util.c:2265 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:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "schimbă o amprentă CA"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 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:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "generează noi chei"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 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:3698
+#: g10/card-util.c:2271 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:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 #, 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:2276
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "schimbă încrederea pentru proprietar"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 msgid "Admin-only command\n"
 msgstr "Comandă numai-administrare\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr "Sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru această comandă\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2341,9 +2347,9 @@ msgstr "cheie"
 msgid "subkey"
 msgstr "Pubkey: "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a eÅŸuat: %s\n"
@@ -2378,19 +2384,19 @@ msgstr ""
 "AVERTISMENT: forţând cifrul simetric %s (%d) violaţi preferinţele "
 "destinatarului\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, 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"
@@ -2401,48 +2407,49 @@ msgstr "nu puteţi folosi algoritmul de cifrare `%s' câtă vreme în modul %s\n
 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:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "folosesc cifrul %s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' deja compresat\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, 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:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 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 "nu puteţi folosi algorimul de rezumat `%s' câtă vreme în modul %s\n"
 
-#: g10/encrypt.c:862
+#: g10/encrypt.c:853
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "citesc din `%s'\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2451,13 +2458,13 @@ msgstr ""
 "AVERTISMENT: forţând algoritmul de compresie %s (%d) violaţi preferinţele "
 "destinatarului\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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"
@@ -2486,67 +2493,79 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTISMENT: nimic exportat\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2614,7 +2633,7 @@ msgstr "Cheia invalidă %s făcută validă de --allow-non-selfsigned-uid\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "folosim subcheia %s în loc de cheia primară %s\n"
 
-#: g10/getkey.c:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opţiuni enumerare invalide\n"
@@ -2697,120 +2716,120 @@ msgstr "generează o nouă perechi de chei"
 msgid "quickly set a new expiration date"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "generează un certificat de revocare"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "ÅŸterge chei de pe inelul de chei public"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "ÅŸterge chei de pe inelul de chei secret"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "semnează o cheie"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "semnează o cheie local"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "semnează o cheie"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "semnează o cheie local"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "semnează sau editează o cheie"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "exportă chei"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "exportă chei pentru un server de chei"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "importă chei de la un server de chei"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "caută pentru chei pe un server de chei"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "actualizează toate cheile de la un server de chei"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "importă/combină chei"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr "afişează starea cardului"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr "schimbă data de pe card"
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr "schimbă PIN-ul unui card"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "actualizează baza de date de încredere"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [fişiere]|afişează rezumate mesaje"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
@@ -2826,57 +2845,57 @@ msgstr "nu face nici o schimbare"
 msgid "prompt before overwriting"
 msgstr "întreabă înainte de a suprascrie"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "crează ieşire în armură ascii"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "foloseÅŸte modul text canonic"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|setează nivel de compresie N (0 deactivează)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 #, 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:781
+#: g10/gpg.c:780
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "enumeră şi verifică semnăturile cheii"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2904,7 +2923,7 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2912,7 +2931,7 @@ msgstr ""
 "@\n"
 "(Arată pagina man pentru o listă completă a comenzilor şi opţiunilor)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2942,13 +2961,13 @@ msgstr ""
 " --list-keys [nume]         arată chei\n"
 " --fingerprint [nume]       arată amprente\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 #, 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:1175
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2963,7 +2982,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "operaţiunea implicită depinde de datele de intrare\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2971,79 +2990,79 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "folosire: gpg [opţiuni] "
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comenzi în conflict\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, 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:1708
+#: g10/gpg.c:1698
 #, 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:1711
+#: g10/gpg.c:1701
 #, 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:1714
+#: g10/gpg.c:1704
 #, 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:1720
+#: g10/gpg.c:1710
 #, 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:1723
+#: g10/gpg.c:1713
 #, 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:1726
+#: g10/gpg.c:1716
 #, 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:1732
+#: g10/gpg.c:1722
 #, 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 +3070,7 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1735
+#: g10/gpg.c:1725
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3061,7 +3080,7 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fiÅŸier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1738
+#: g10/gpg.c:1728
 #, 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 +3088,7 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1744
+#: g10/gpg.c:1734
 #, 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 +3096,7 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1747
+#: g10/gpg.c:1737
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3088,7 +3107,7 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fiÅŸier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1750
+#: g10/gpg.c:1740
 #, 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 +3115,478 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1966
+#: g10/gpg.c:1956
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 #, 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:2086
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "showpref"
+msgid "show preferences"
+msgstr "showpref"
+
+#: g10/gpg.c:2197
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "opţiune necunoscută `%s'\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, 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:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, 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:3220
+#: g10/gpg.c:3194
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Nu este o adresă de email validă\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, 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:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opţiuni server de chei invalide\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "opţiuni server de chei invalide\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opţiuni import invalide\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "opţiuni import invalide\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opţiuni export invalide\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "opţiuni export invalide\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opţiuni verificare invalide\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr "opţiuni verificare invalide\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execuţie ca %s\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opţiuni verificare invalide\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, 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:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s înlocuieşte %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, 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:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3952
-#, 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:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, 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:3987
+#: g10/gpg.c:3950
 #, 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:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferinţe implicite invalide\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferinţe cifrare personale invalide\n"
 
-#: g10/gpg.c:4015
-#, 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:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferinţe rezumat personale invalide\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferinţe compresie personale invalide\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, 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:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge încă cu %s!\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am eşuat să iniţializez TrustDB:%s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, 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:4417
+#: g10/gpg.c:4365
 #, 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:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, 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:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepţie server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie eÅŸuat: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, 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:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "căutare server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei eşuată: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a eÅŸuat: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a eÅŸuat: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Daţi-i drumul şi scrieţi mesajul ...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, 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:5759
+#: g10/gpg.c:5715
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
@@ -3593,7 +3600,7 @@ msgstr "ia cheile de pe acest inel de chei"
 msgid "make timestamp conflicts only a warning"
 msgstr "dă numai un avertisment la conflicte de timestamp"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 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,343 +3631,343 @@ msgstr "Nici un ajutor disponibil"
 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:1998 g10/import.c:3146
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cheia %s: nici un ID utilizator\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, 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:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cheia %s: cheie nouă - sărită\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cheia %s: cheie secretă importată\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, 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:2801
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
@@ -3973,204 +3980,204 @@ msgstr "eroare trimitere la `%s': %s\n"
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, 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:3138 g10/import.c:3177
 #, 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:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "motiv pentru revocare: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "comentariu revocare: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cheia %s: legare subcheie invalidă\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3788
 #, 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:3812
 #, 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:3825
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cheia %s: revocare de subcheie invalidă\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3840
 #, 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:3887
 #, 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:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cheia %s: am sărit subcheia\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cheia %s: am adăugat semnătura de cheie directă\n"
@@ -4211,7 +4218,7 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "ID utilizator \"%s\" a fost revocat."
 msgstr[1] "ID utilizator \"%s\" a fost revocat."
 
-#: g10/key-check.c:726 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 +4226,7 @@ msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr[0] "1 semnătură nu a fost verificată din cauza unei chei lipsă\n"
 msgstr[1] "1 semnătură nu a fost verificată din cauza unei chei lipsă\n"
 
-#: g10/key-check.c:734 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"
@@ -4274,15 +4281,15 @@ msgstr "resursă keyblock `%s': %s\n"
 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:262
 msgid "[revocation]"
 msgstr "[revocare]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[auto-semnătură]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4293,17 +4300,17 @@ msgstr ""
 "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:389 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:390 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:408
 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 +4320,53 @@ msgstr ""
 "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:425
 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:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 #, 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  Nu pot semna.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "ID utilizator \"%s\" este expirat."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, 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:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "ID-ul utilizator \"%s\" poate fi semnat.  "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr "Doriţi să-l semnaţi? (d/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4368,11 +4375,11 @@ msgstr ""
 "Auto-semnătura pe \"%s\"\n"
 "este o semnătură stil PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4381,12 +4388,12 @@ msgstr ""
 "Semnătura d-voastră curentă pe \"%s\"\n"
 "a expirat.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4395,43 +4402,43 @@ msgstr ""
 "Semnătura d-voastră curentă pe \"%s\"\n"
 "semnătură locală.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "Această cheie a expirat!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4442,33 +4449,33 @@ msgstr ""
 "î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:874
 #, 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:876
 #, 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:878
 #, 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:881
 #, 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:888
 #, 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:915
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4477,238 +4484,238 @@ msgstr ""
 "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:923
 msgid "This will be a self-signature.\n"
 msgstr "Aceasta va fi o auto-semnătură.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 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:935
 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:945
 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:952
 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:959
 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:964
 msgid "I have checked this key casually.\n"
 msgstr "Am verificat această cheie superficial.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 msgid "I have checked this key very carefully.\n"
 msgstr "Am verificat această cheie foarte atent.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:981
 msgid "Really sign? (y/N) "
 msgstr "Doriţi cu adevărat să semnaţi? (d/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a eÅŸuat: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 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:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "salvează şi termină"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 msgid "show key fingerprint"
 msgstr "afişează amprenta cheii"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Notare semnătură: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "enumeră chei şi ID-uri utilizator"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "selectează ID utilizator N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr "selectează subcheia N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr "verifică semnături"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 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:1286
 msgid "sign selected user IDs locally"
 msgstr "semnează ID-urile utilizatorilor selectaţi local"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 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:1289
 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:1291
 msgid "add a user ID"
 msgstr "adaugă un ID utilizator"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "adaugă o poză ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr "ÅŸterge ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr "adaugă o subcheie"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr "adaugă o cheie la un smartcard"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr "mută o cheie pe un smartcard"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr "mută o cheie de rezervă pe un smartcard"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 msgid "delete selected subkeys"
 msgstr "ÅŸterge subcheile selectate"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "adaugă o cheie de revocare"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 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:1314
 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:1316
 msgid "flag the selected user ID as primary"
 msgstr "marchează ID-ul utilizator selectat ca primar"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "enumeră preferinţele (expert)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "afişează preferinţele (detaliat)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 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:1325
 #, 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:1327
 #, 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:1329
 msgid "change the passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "schimbă încrederea pentru proprietar"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 msgid "revoke signatures on the selected user IDs"
 msgstr "revocă semnăturile pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 msgid "revoke selected user IDs"
 msgstr "revocă ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "revoke key or selected subkeys"
 msgstr "revocă cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "enable key"
 msgstr "activează cheia"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr "deactivează cheia"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr "arată pozele pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1349
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1470
 msgid "Secret key is available.\n"
 msgstr "Cheia secretă este disponibilă.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 #, 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:1574
 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:1597
 #, fuzzy
 #| msgid ""
 #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@ -4727,305 +4734,289 @@ msgstr ""
 "  pentru semnături irevocabile (nrsign), sau orice combinaţie a acestora\n"
 "  (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "Cheia este revocată."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 #, 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:1682
 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:1690
 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:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 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:1756
 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:1814 g10/keyedit.c:1854
 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 msgid "You must select exactly one key.\n"
 msgstr "Trebuie să selectaţi exact o cheie.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 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:1915
 #, 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:1934
 #, 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:1969
 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:1975
 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:1977
 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:2015
 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:2016
 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:2034
 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:2045
 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:2047
 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:2105
 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:2150
 msgid "Set preference list to:\n"
 msgstr "Setează lista de preferinţe ca:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 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:2159
 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:2233
 msgid "Save changes? (y/N) "
 msgstr "Salvaţi schimbările?  (d/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr "Terminaţi fără a salva?  (d/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, 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:2557
+#: g10/keyedit.c:2558
 #, 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:2583
+#: g10/keyedit.c:2584
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, 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:2677
+#: g10/keyedit.c:2717
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "amprentă invalidă"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "am eşuat să stochez amprenta: %s\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "valoare invalidă\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Nu există acest ID utilizator.\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, 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:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, 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:3211
+#: g10/keyedit.c:3251
 #, 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:3253
+#: g10/keyedit.c:3293
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "amprentă invalidă"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, 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:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Rezumat: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Capabilităţi: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr "Server de chei no-modify"
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaţie:"
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "creată: %s"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr "revocată: %s"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr "expirată: %s"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "expiră: %s"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr "folosire: %s"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr "nr-card: "
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr "încredere: %s"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr "validitate: %s"
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Această cheie a fost deactivată"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5034,17 +5025,17 @@ msgstr ""
 "corectă dacă nu reporniţi programul.\n"
 
 #
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "expirată"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5054,18 +5045,18 @@ msgstr ""
 "              Această comandă poate cauza ca un alt ID utilizator\n"
 "              să devină ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5074,35 +5065,35 @@ msgstr ""
 "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:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 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:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Ştergeţi această semnătură bună? (d/N/t)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Ştergeţi această semnătură invalidă? (d/N/t)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Ştergeţi această semnătură necunoscută? (d/N/t)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Ştergeţi într-adevăr această auto-semnătură? (d/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5110,37 +5101,37 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Am şters %d semnături.\n"
 msgstr[1] "Am şters %d semnături.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Nu am ÅŸters nimic.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "invalid(ă)"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "ID utilizator \"%s\" a fost revocat."
 msgstr[1] "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5150,43 +5141,43 @@ msgstr ""
 "             desemnat poate face ca unele versiuni de PGP să respingă "
 "cheia.\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduceţi ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 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:4719
+#: g10/keyedit.c:4611
 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:4788
+#: g10/keyedit.c:4680
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5197,183 +5188,183 @@ msgstr ""
 "Sunteţi sigur(ă) că doriţi să desemnaţi această cheie ca şi un revocator "
 "desemnat? (d/N) "
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primară.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 #, 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:4915
+#: g10/keyedit.c:4807
 #, 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:5033
+#: g10/keyedit.c:4925
 #, 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:5039
+#: g10/keyedit.c:4931
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Vă rugăm selectaţi exact un ID utilizator.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, 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:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduceţi URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 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:5451
+#: g10/keyedit.c:5345
 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:5516
+#: g10/keyedit.c:5410
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notare semnătură: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, 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:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (non-exportabilă)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Această semnătură a expirat pe %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 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:6078
+#: g10/keyedit.c:5972
 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:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr " (non-revocabilă)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocată de cheia d-voastră %s pe %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunteţi pe cale să revocaţi aceste semnături:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 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:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "nici o cheie secretă\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, 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:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, 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:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocată.\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocată.\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, 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"
@@ -5416,51 +5407,51 @@ msgstr "prea multe preferinţe de cifrare\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "articol invalid `%s' în şirul de preferinţe\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "scriu semnătură directă\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "scriu auto semnătură\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "scriu semnătură legată de cheie\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "lungime cheie invalidă; folosesc %u biţi\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "lungime cheie rotunjită la %u biţi\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr "Semnează"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr "Cifrează"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr "Autentifică"
 
@@ -5474,185 +5465,185 @@ msgstr "Autentifică"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr "SsCcAaTt"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, 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:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr "Acţiuni permise curent: "
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Comută capabilitatea de semnare\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Comută capabilitatea de cifrare\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Comută capabilitatea de autentificare\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Terminat\n"
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA ÅŸi Elgamal (implicit)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA ÅŸi Elgamal (implicit)\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, 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:2136
+#: g10/keygen.c:2113
 #, 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:2142
+#: g10/keygen.c:2119
 #, 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:2144
+#: g10/keygen.c:2121
 #, 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:2150
+#: g10/keygen.c:2127
 #, 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:2152
+#: g10/keygen.c:2129
 #, 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:2158
+#: g10/keygen.c:2135
 #, 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:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr "(implicit)"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (numai semnare)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, 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:2163
+#: g10/keygen.c:2140
 #, 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:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Notare semnătură: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 #, fuzzy
 msgid "No key with this keygrip\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 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:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "deactivează cheia"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, 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:2570
+#: g10/keygen.c:2547
 #, 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:2578
+#: g10/keygen.c:2555
 #, fuzzy, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Ce lungime de cheie doriţi? (%u) "
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 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:2641
+#: g10/keygen.c:2618
 #, 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:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5668,7 +5659,7 @@ msgstr ""
 "      <n>m = cheia expiră în n luni\n"
 "      <n>y = cheia expiră în n ani\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5684,38 +5675,38 @@ msgstr ""
 "      <n>m = semnătura expiră în n luni\n"
 "      <n>y = semnătura expiră în n ani\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Cheia este validă pentru? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Semnătura este validă pentru? (%s) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "valoare invalidă\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr "Cheia nu expiră deloc\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr "Semnătura nu expiră deloc\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Cheia expiră pe %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Semnătura expiră pe %s\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5723,11 +5714,11 @@ msgstr ""
 "Sistemul d-voastră nu poate afişa date după 2038.\n"
 "Totuşi, acestea vor fi corect mânuite până în 2106.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr "Este aceasta corect? (d/N) "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5738,7 +5729,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5755,42 +5746,42 @@ msgstr ""
 "    \"Popa Ioan (popică) <popa.ioan@compania.ro>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Nume real: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Caracter invalid în nume\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "Adresă de email: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Nu este o adresă de email validă\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Comentariu: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Caracter invalid în comentariu\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, 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:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5801,11 +5792,11 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5820,35 +5811,35 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoTt"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 #, 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:3148
+#: g10/keygen.c:3125
 #, 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Vă rugăm corectaţi mai întâi eroarea\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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 +5851,18 @@ msgstr ""
 "în timpul generării numerelor prime; aceasta dă o şansă generatorului de\n"
 "numere aleatoare o şansă mai bună de a aduna destulă entropie.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a eÅŸuat: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5879,72 +5870,72 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, fuzzy, c-format
 #| msgid "key already exists\n"
 msgid "A key for \"%s\" already exists\n"
 msgstr "cheia există deja\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 #, fuzzy
 #| msgid "Create anyway? "
 msgid "Create anyway? (y/N) "
 msgstr "Creaţi oricum? "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, fuzzy, c-format
 #| msgid "Create anyway? "
 msgid "creating anyway\n"
 msgstr "Creaţi oricum? "
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Generarea cheii a fost anulată.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, 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:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, 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:5599
+#: g10/keygen.c:5570
 #, 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:5613
+#: g10/keygen.c:5584
 #, 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:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secretă şi publică au fost create şi semnate.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 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 +5945,7 @@ msgstr ""
 "să folosiţi comanda \"--edit-key\" pentru a genera o subcheie secundară\n"
 "pentru acest scop.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5962,7 +5953,7 @@ msgstr ""
 "cheia a fost creată %lu secundă în viitor (warp în timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5970,23 +5961,23 @@ msgstr ""
 "cheia a fost creată %lu secunde în viitor (warp în timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr "Creaţi într-adevăr? (d/N) "
 
@@ -5994,27 +5985,43 @@ msgstr "Creaţi într-adevăr? (d/N) "
 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 +6029,7 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d semnături incorecte\n"
 msgstr[1] "%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 +6037,40 @@ msgid_plural "%d signatures not checked due to errors\n"
 msgstr[0] "1 semnătură nu a fost verificată din cauza unei erori\n"
 msgstr[1] "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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Inel de chei"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Amprentă cheie primară:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr " Amprentă cheie primară:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "      Amprentă subcheie:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr "      Amprentă cheie ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr "      Card nr. serie ="
 
@@ -6444,7 +6451,7 @@ msgstr "binar"
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "necunoscut"
 
@@ -6587,29 +6594,29 @@ msgstr "Necompresat"
 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:1614
 #, 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:1639
 #, 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:1877
 #, 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:1899
 #, fuzzy, c-format
 #| msgid "Unknown signature type `%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6740,7 +6747,7 @@ msgid ""
 "%s"
 msgstr "cheia %u-bit %s, ID %s, creată %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6756,76 +6763,76 @@ msgstr ""
 "foarte largă!\n"
 "Încercaţi să folosiţi o imagine de aproximativ 240x288 pixeli.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Introduceţi nume-fişier JPEG pentru poză ID: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, 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:239
 #, 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:241
 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:257
 #, 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:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Este această poză corectă (d/N/t)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, 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:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "ieşire nenaturală a programului extern\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6833,7 +6840,7 @@ msgstr ""
 "chemarea programelor externe sunt deactivate datorită opţiunilor nesigure "
 "pentru permisiunile fiÅŸierului\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "nu pot afiÅŸa poza ID!\n"
@@ -7168,12 +7175,12 @@ msgstr "destinatar implicit necunoscut \"%s\"\n"
 msgid "no valid addressees\n"
 msgstr "nici un destinatar valid\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, 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:1768
+#: g10/pkclist.c:1766
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "cheia %s nu are nici un ID utilizator\n"
@@ -8241,7 +8248,7 @@ msgstr "folosesc model de încredere %s\n"
 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"
@@ -8273,7 +8280,7 @@ msgstr "vă rugăm faceţi un --check-trustdb\n"
 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"
@@ -8281,7 +8288,7 @@ msgid_plural "%d keys processed"
 msgstr[0] "%lu chei procesate până acum\n"
 msgstr[1] "%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"
@@ -8289,24 +8296,24 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d chei procesate (%d numărători valide anulate)\n"
 msgstr[1] "%d chei procesate (%d numărători valide anulate)\n"
 
-#: g10/trustdb.c: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 ""
@@ -8436,7 +8443,7 @@ msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8444,7 +8451,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8480,7 +8487,7 @@ msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8569,75 +8576,75 @@ msgstr[1] "generarea cheii este completă (%d secunde)\n"
 msgid "response does not contain the public key data\n"
 msgstr "răspunsul nu conţine datele cheii publice\n"
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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%%0A[semnături făcute: %lu]"
 
-#: scd/app-p15.c:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-nks.c:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, 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:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, 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:1654
+#: 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:1701
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2074
+#: scd/app-nks.c:2088
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-nks.c:2082
+#: 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%%0A[semnături făcute: %lu]"
 
-#: scd/app-nks.c:2092
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2102
+#: 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:2104
+#: 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:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
@@ -8907,13 +8914,13 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8922,11 +8929,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:199 sm/certchain.c:2211
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 #, fuzzy
 msgid "shell"
 msgstr "ajutor"
@@ -8950,241 +8957,241 @@ msgstr ""
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, 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:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:818
 #, 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:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, 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:1260 sm/certchain.c:1264
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "NOTĂ: cheia a fost revocată"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 #, 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:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Această cheie a expirat!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Această cheie a expirat!"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Această cheie a expirat!"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1404
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Această cheie a expirat!"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "semnături create până acum: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Certificat de revocare creat.\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "certificat incorect"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, fuzzy, c-format
 msgid "  (     issuer valid from "
 msgstr "      Card nr. serie ="
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "Amprenta CA: "
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1505
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1511
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "generează un certificat de revocare"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, 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:1911 dirmngr/validate.c:693
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "preferinţa `%s' duplicată\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Certificat de revocare creat.\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "certificat incorect"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9207,7 +9214,7 @@ msgstr "neforţat(ă)"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "nu"
@@ -9244,42 +9251,42 @@ msgstr ""
 "\"%.*s\"\n"
 "cheia %u-bit %s, ID %s, creată %s%s\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "certificat incorect"
@@ -9843,7 +9850,7 @@ msgstr ""
 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:916
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
@@ -10037,7 +10044,7 @@ msgstr "citirea cheii publice a eÅŸuat: %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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "eroare în `%s': %s\n"
@@ -10292,168 +10299,168 @@ msgstr "algoritm hash invalid `%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1849 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:1923
 #, 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:1938
 #, 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:1945
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, 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:1984
 #, 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:2011
 #, 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:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, 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:2084
 #, 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:2226
 #, 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:2233
 #, 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:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, 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:2301
 #, 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:2308
 #, 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:2333
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2414
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, 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:2460
 #, 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:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 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:2523
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, fuzzy, c-format
 #| msgid "WARNING: invalid size of random_seed file - not used\n"
 msgid " WARNING: invalid cache record length\n"
@@ -10461,36 +10468,36 @@ msgstr ""
 "AVERTISMENT: dimensiune invalidă pentru fişierul random_seed - nu va fi "
 "folosită\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2558
 #, 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:2569
 #, 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:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "actualizarea a eÅŸuat: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, 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:2779
+#: dirmngr/crlcache.c:2780
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "citirea cheii publice a eÅŸuat: %s\n"
@@ -10855,13 +10862,13 @@ msgstr "folosire: gpg [opţiuni] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, 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:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a eÅŸuat: %s\n"
@@ -11116,94 +11123,94 @@ msgstr "verificarea semnăturii create a eşuat: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:582
+#: 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:598 dirmngr/ocsp.c:782
+#: 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:642
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "cheia secretă \"%s\" nu a fost găsită: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:698
+#: 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:708
+#: 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:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:753
+#: 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:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:765
+#: 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:822
+#: 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:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11217,65 +11224,65 @@ msgstr "semnarea a eÅŸuat: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "semnarea a eÅŸuat: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, 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:1776
 #, 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:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, 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:3033
+#: dirmngr/server.c:3049
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: am eşuat să creez hashtable: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, 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:3062
+#: dirmngr/server.c:3078
 #, 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:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11596,87 +11603,103 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: 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:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Certificat de revocare creat.\n"
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: 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:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3707
+#: tools/gpg-card.c:3765
 #, fuzzy
 msgid "read a certificate from a data object"
 msgstr "Certificat de revocare creat.\n"
 
-#: tools/gpg-card.c:3708
+#: tools/gpg-card.c:3766
 #, fuzzy
 msgid "store a certificate to a data object"
 msgstr "Certificat de revocare creat.\n"
 
-#: tools/gpg-card.c:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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"
@@ -13634,9 +13657,6 @@ msgstr ""
 #~ msgid "pref"
 #~ msgstr "pref"
 
-#~ msgid "showpref"
-#~ msgstr "showpref"
-
 #~ msgid "setpref"
 #~ msgstr "setpref"
 
diff --git a/po/ru.gmo b/po/ru.gmo
index 495553e..cba10b6 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index 12535eb..4f62cfe 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.2.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2020-07-20 17:41+0100\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@@ -150,8 +150,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Фраза-пароль:"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "не подходит - попробуйте еще раз"
 
@@ -200,17 +200,17 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "ошибка получени� �ерийного номера карты: %s\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Повторите фразу-пароль:"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -221,7 +221,7 @@ msgid ""
 msgstr ""
 "Введите фразу-пароль дл� защиты импортированных объектов в �и�теме GnuPG."
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -232,25 +232,25 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "не могу открыть '%s': %s\n"
@@ -260,12 +260,12 @@ msgstr "не могу открыть '%s': %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "на карте не найдено подход�щего ключа: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "ошибка получени� �пи�ка карт: %s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -274,20 +274,20 @@ msgstr ""
 "Проце�� ssh запро�ил до�туп к ключу%%0A  %s%%0A  (%s)%%0AВы хотите �то "
 "позволить?"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Позволить"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Отказать"
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -296,7 +296,7 @@ msgstr ""
 "Введите фразу-пароль дл� защиты полученного �екретного ключа%%0A   %s%%0A   "
 "%s%%0Aвнутри хранилища ключей агента gpg"
 
-#: agent/command-ssh.c:3797
+#: agent/command-ssh.c:3837
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "�бой �оздани� потока из �окета: %s\n"
@@ -428,214 +428,220 @@ msgstr "Введите фразу-пароль%0AдлÑ� защиты новогÐ
 msgid "Please enter the new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Параметры, полезные дл� отладки"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr "запу�к в режиме демона (фоновый режим)"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr "запу�к в режиме �ервера (нефоновый режим)"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "не от�оедин�ть�� от кон�оли"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr "вывод команд в �тиле sh"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr "вывод команд в �тиле csh"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|вз�ть параметры из файла FILE"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr "Параметры, управл�ющие выводом диагно�тики"
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "подробно"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "�ократить подробно�ти"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|�охран�ть журнал режима �ервера в файле FILE"
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr "Параметры, управл�ющие на�тройками"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 msgid "do not use the SCdaemon"
 msgstr "не и�пользовать демон криптографиче�ких карт"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|и�пользовать программу PGM как демон криптографиче�ких карт"
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|и�пользовать программу PGM как демон криптографиче�ких карт"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|принимать некоторые команды по NAME"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr "игнорировать запро�ы �мены терминала"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr "игнорировать запро�ы �мены ди�пле� XWindow"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 msgid "enable ssh support"
 msgstr "включить поддержку ssh"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|и�пользовать дл� отображени� отпечатков алгоритм ALGO"
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 msgid "enable putty support"
 msgstr "включить поддержку putty"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "включить поддержку putty"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "Параметры, управл�ющие безопа�но�тью"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|�бра�ывать запомненный PIN через N �екунд"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|�бра�ывать ключи SSH по и�течении N �екунд"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|у�тановить мак�имальный �рок запоминани� PIN N �екунд"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|у�тановить мак�имальный �рок дей�тви� ключа SSH N �екунд"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr "не и�пользовать запомненный PIN при подпи�ывании"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 msgid "disallow the use of an external password cache"
 msgstr "не позвол�ть пользовать�� внешней пам�тью паролей"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "не позвол�ть клиентам помечать ключи как \"доверенные\""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 msgid "allow presetting passphrase"
 msgstr "разрешить преду�танавливать фразу-пароль"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr "Параметры, обе�печивающие правила дл� фраз-паролей"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr "не позвол�ть обходить правила дл� фраз-паролей"
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|у�тановить минимальную длину фразы-парол� равной N"
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|n|требовать дл� новой фразы-парол� не менее N неалфавитных �имволов"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|провер�ть новую фразу-пароль по файлу образцов FILE"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|�читать фразу-пароль у�таревшей через N дней"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 msgid "do not allow the reuse of old passphrases"
 msgstr "не разрешать повторное и�пользование �тарых фраз-паролей"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Параметры, управл�ющие безопа�но�тью"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr ""
 "не позвол�ть вызывающей программе замещать �обой программу ввода парол�"
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "не захватывать клавиатуру и мышь"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|и�пользовать программу PGM дл� ввода паролей"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|у�тановить врем� ожидани� ввода парол� N �екунд"
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: 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:570
+#: agent/gpg-agent.c:582
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Вызов: @GPG_AGENT@ [параметры] (-h - под�казка)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -643,135 +649,135 @@ msgstr ""
 "Синтак�и�: @GPG_AGENT@ [параметры] [команда [аргументы]]\n"
 "Управление �екретными ключами дл� @GNUPG@\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "запрошен недопу�тимый уровень отладки '%s'\n"
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана недопу�тима� хеш-функци�\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "чтение параметров из '%s'\n"
 
-#: agent/gpg-agent.c:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "Внимание: параметр \"%s\" не рекомендует��\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не могу �оздать �окет: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "�лишком длинное им� �окета '%s'\n"
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "агент gpg уже запущен - еще один, новый, запущен не будет\n"
 
-#: agent/gpg-agent.c:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "ошибка получени� разового кода дл� �окета\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "ошибка �в�зывани� �окета � '%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "не удало�ь задать права до�тупа дл� '%s': %s\n"
 
-#: agent/gpg-agent.c:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "�лушаем �окет '%s'\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "не могу �оздать каталог '%s': %s\n"
 
-#: agent/gpg-agent.c:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "�оздан каталог '%s'\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "�бой stat() дл� '%s': %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "невозможно и�пользовать '%s' как домашний каталог\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "ошибка чтени� разового кода из файлового де�криптора %d: %s\n"
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "обработчик 0x%lx дл� файлового де�криптора %d запущен\n"
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "обработчик 0x%lx дл� файлового де�криптора %d завершил��\n"
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "обработчик ssh 0x%lx дл� файлового де�криптора %d запущен\n"
 
-#: agent/gpg-agent.c:2853
+#: agent/gpg-agent.c:2967
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "обработчик ssh 0x%lx дл� файлового де�криптора %d завершил��\n"
 
-#: agent/gpg-agent.c:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "�бой npth_pselect: %s - жду 1 �екунду\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s о�тановлен\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1041,7 +1047,7 @@ msgstr "�бой проверки �озданной подпи�и: %s\n"
 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:1602
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "алгоритм шифровани� � открытым ключом %d (%s) не поддерживает��\n"
@@ -1056,52 +1062,52 @@ msgstr "алгоритм защиты %d (%s) не поддерживает��\
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1131,18 +1137,18 @@ msgstr "Внимание: небезопа�ный владелец объект
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Внимание: небезопа�ные права до�тупа объекта %s \"%s\"\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "ожидаю до�тупа к файлу '%s'\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "да|yes"
 
@@ -1196,8 +1202,8 @@ msgstr "выход за предел безопа�ной пам�ти при р
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "ошибка выделени� до�таточной пам�ти: %s\n"
@@ -1217,77 +1223,77 @@ msgstr "Внимание: параметр \"%s%s\" у�тарел - он игн
 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:432 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"
@@ -1435,11 +1441,11 @@ msgstr "Цепочка �ертификатов до�товерна"
 msgid "Root certificate trustworthy"
 msgstr "Корневой �ертификат до�товерен"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 msgid "no CRL found for certificate"
 msgstr "дл� �ертификата не найден �пи�ок отозванных �ертификатов"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 msgid "the available CRL is too old"
 msgstr "до�тупный �пи�ок отозванных �ертификатов �лишком �тар"
 
@@ -1476,7 +1482,7 @@ msgstr "�ет �правки дл� '%s'."
 msgid "ignoring garbage line"
 msgstr "игнорируем дефектную �троку"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "[none]"
 msgstr "[от�ут�твует]"
 
@@ -1520,36 +1526,36 @@ msgstr "�бой в iconv_open: %s\n"
 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
 #, 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"
@@ -1559,92 +1565,92 @@ msgstr "ожидаю �н�ти� блокировки %s...\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "�лишком �тара� вер�и� %s (нужно %s, е�ть %s)\n"
 
-#: g10/armor.c:441
+#: 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"
@@ -1652,12 +1658,12 @@ msgstr ""
 "�имвол quoted printable в тек�товом формате - и�порчено почтовой "
 "программой?\n"
 
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, c-format
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "[ не дл� чтени� человеком (%zu байт: %s%s) ]"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1666,32 +1672,32 @@ msgstr ""
 "им� замечани� должно �одержать только печатные �имволы или пробелы и "
 "заканчивать�� знаком '='\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "им� пользователь�кого замечани� должно �одержать �имвол '@'\n"
 
-#: g10/build-packet.c:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "им� замечани� не должно �одержать более одного �имвола '@'\n"
 
-#: g10/build-packet.c:1550
+#: g10/build-packet.c:1568
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "в тек�те замечани� не должно быть управл�ющих �имволов\n"
 
-#: g10/build-packet.c:1606
+#: g10/build-packet.c:1624
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "им� замечани� не должно �одержать �имвола '='\n"
 
-#: g10/build-packet.c:1612
+#: g10/build-packet.c:1630
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr "им� замечани� должно �одержать только печатные �имволы или пробелы\n"
 
-#: g10/build-packet.c:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "Внимание: найдена недопу�тима� форма запи�и замечани�\n"
@@ -1705,7 +1711,7 @@ msgstr "�бой при тран�л�ции запро�а %s клиенту\n"
 msgid "Enter passphrase: "
 msgstr "Введите фразу-пароль:"
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 g10/sign.c:473
 #: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
@@ -1723,7 +1729,7 @@ msgstr "ошибка чтени� из %s: %s\n"
 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:2330
+#: 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"
@@ -1762,169 +1768,169 @@ msgstr "недопу�тимое перенаправление HTTP � �ерв
 msgid "server uses an invalid certificate"
 msgstr "на �ервере примен�ет�� непригодный �ертификат"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Ваш выбор? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "Уважаемый"
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "Уважаема�"
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "не требует��"
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "требует��"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 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:1500
+#: g10/card-util.c:803 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:1502
+#: g10/card-util.c:805 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Ошибка: Двойные пробелы недопу�тимы.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Фамили� держател� карты: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Им� держател� карты: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Учетна� запи�ь (им�): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Секретные данные DO:"
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Предпочтительный �зык: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 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:1800
+#: g10/card-util.c:1199 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Ошибка: недопу�тимый ответ.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "отпечаток удо�товер�ющего центра: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Ошибка: недопу�тимый формат отпечатка.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1296
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "операци� � ключом невозможна: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1297
 msgid "not an OpenPGP card"
 msgstr "�то не карта OpenPGP"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "ошибка при �читывании информации ключа: %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1395
 msgid "Replace existing key? (y/N) "
 msgstr "Заменить �уще�твующий ключ? (y/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 tools/gpg-card.c:3363
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1940,99 +1946,99 @@ msgstr ""
 "           Е�ли �оздать ключ не уда�т��, �верьте�ь � документацией\n"
 "           на карту и вы��ните, какие размеры допу�тимы.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Какой размер ключа Вам необходим? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr "Изменение атрибутов ключа на карте:"
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 msgid "Signature key\n"
 msgstr "Ключа дл� подпи�и\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 msgid "Encryption key\n"
 msgstr "Ключа дл� шифровани�\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr "Ключа дл� удо�товерени� лично�ти\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "�еправильный выбор.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Замечание: ключи уже хран�т�� на карте!\n"
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2429
+#: g10/card-util.c:1694 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "Заменить �уще�твующие ключи? (y/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2043,181 +2049,181 @@ msgstr ""
 "   PIN = '%s'    �дмин. PIN = '%s'\n"
 "Вам �ледует изменить их командой --change-pin\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 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:1743 g10/card-util.c:1833
 msgid "   (1) Signature key\n"
 msgstr "   (1) Ключ подпи�и\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1744 g10/card-util.c:1835
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Ключ шифровани�\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ удо�товерени� лично�ти\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 msgid "Please select where to store the key:\n"
 msgstr "Выберите, где хранить ключ:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1876
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "�бой запи�и ключа на карту: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "Подтвердите �бро� к завод�ким у�тановкам (введите \"yes\") "
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "ошибка при на�тройке KDF: %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "выйти из �того меню"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr "показать админи�тративные команды"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "показать данную �правку"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "выве�ти в�е до�тупные данные"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "изменить им� держател� карты"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "изменить URL получени� ключа"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3689
+#: g10/card-util.c:2262 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:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "изменить им� учетной запи�и"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "изменить �зыковые предпочтени�"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr "изменить привет�твие дл� держател� карты"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "�менить отпечаток удо�товер�ющего центра"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "переключить признак 'подпи�ь требует PIN'"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "�оздать новые ключи"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "меню изменени� или разблокировки PIN"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3698
+#: g10/card-util.c:2271 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "проверить PIN и показать в�е данные"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "разблокировать PIN � помощью кода �бро�а"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr "уничтожить в�е ключи и данные"
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 #, 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:2276
 msgid "change the key attribute"
 msgstr "изменить атрибут ключа"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 msgid "Admin-only command\n"
 msgstr "Команды админи�трировани�\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr "Команды админи�трировани� разрешены\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 msgid "Admin commands are not allowed\n"
 msgstr "Команды админи�трировани� не разрешены\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�едопу�тима� команда (�пи�ок команд: \"help\")\n"
 
-#: g10/decrypt.c:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output дл� данной команды не работает\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 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 +2284,9 @@ msgstr "ключа"
 msgid "subkey"
 msgstr "подключа"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�бой при обновлении: %s\n"
@@ -2313,19 +2319,19 @@ msgstr ""
 "Внимание: принудительное и�пользование �имметричного шифра %s (%d)\n"
 "          нарушает предпочтени� получател�\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм шифровани� '%s' нельз� и�пользовать в режиме %s\n"
@@ -2335,57 +2341,58 @@ msgstr "алгоритм шифровани� '%s' нельз� и�пользо
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "Внимание: ключ %s не подходит дл� шифровани� в режиме %s\n"
 
-#: g10/encrypt.c:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "ошибка при �оздании фразы-парол�: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "и�пользует�� �имметричный шифр %s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s' уже �жат\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "Внимание: файл '%s' пу�т\n"
 
-#: g10/encrypt.c:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "хеш-функцию '%s' нельз� и�пользовать в режиме %s\n"
 
-#: g10/encrypt.c:862
+#: g10/encrypt.c:853
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "чтение из '%s'\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "Внимание: �жатие алгоритмом %s (%d) нарушает предпочтени� получател�\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "параметр '%s' нельз� и�пользовать в режиме %s\n"
@@ -2413,63 +2420,75 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "Внимание: нечего �к�портировать\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2536,7 +2555,7 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "и�пользую подключ %s вме�то первичного ключа %s\n"
 
-#: g10/getkey.c:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "недопу�тимые значени� дл� параметра \"%s\"\n"
@@ -2609,113 +2628,113 @@ msgstr "быÑ�тро отозвать идентификатор пользовÐ
 msgid "quickly set a new expiration date"
 msgstr "бы�тро у�тановить новый �рок дей�тви�"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr "�оздание полноценной пары ключей"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "�оздать �ертификат отзыва"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "удалить ключи из таблицы �екретных ключей"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "quickly sign a key"
 msgstr "бы�тро подпи�ать ключ"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 msgid "quickly sign a key locally"
 msgstr "бы�тро подпи�ать ключ локально"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, fuzzy
 #| msgid "quickly revoke a user-id"
 msgid "quickly revoke a key signature"
 msgstr "бы�тро отозвать идентификатор пользовател�"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "подпи�ать ключ"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "подпи�ать ключ локально"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "подпи�ать или редактировать ключ"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "�менить фразу-пароль"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "�к�портировать ключи"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "�к�портировать ключи на �ервер ключей"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "импортировать ключи � �ервера ключей"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "и�кать ключи на �ервере ключей"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "обновить в�е ключи � �ервера ключей"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "импортировать/объединить ключи"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr "показать �о�то�ние карты"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr "изменить данные на карте"
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr "�менить PIN карты"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "обновить таблицу довери�"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 msgid "print message digests"
 msgstr "выве�ти хеши �ообщений"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "запу�к в режиме �ервера"
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|у�тановить правила TOFU дл� ключа"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|и�пользовать NAME как о�новной �екретный ключ"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|зашифровывать также дл� идентификатора пользовател� NAME"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|у�тановить �инонимы �лектронной почты"
 
@@ -2731,59 +2750,59 @@ msgstr "не делать никаких изменений"
 msgid "prompt before overwriting"
 msgstr "�про�ить перед перезапи�ью"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Параметры, управл�ющие безопа�но�тью"
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Параметры, управл�ющие выводом диагно�тики"
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "вывод в тек�товом формате"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|выводить данные в файл FILE"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "и�пользовать канониче�кий тек�товый режим"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|у�тановить уровень �жати� N (0 - без �жати�)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
 msgstr "Параметры, управл�ющие интерактивно�тью и принудительными дей�тви�ми"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 "|MECHANISMS|и�пользовать механизмы MECHANISMS дл� пои�ка ключей по адре�у "
 "�лектронной почты"
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 msgid "import missing key from a signature"
 msgstr "импортировать недо�тающий ключ из подпи�и"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 msgid "include the public key in signatures"
 msgstr "вно�ить открытый ключ в подпи�и"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "полно�тью запретить до�туп к dirmngr"
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2811,7 +2830,7 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2819,7 +2838,7 @@ msgstr ""
 "@\n"
 "(Полный �пи�ок команд и параметров �м. на �транице man)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2839,11 +2858,11 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Вызов: @GPG@ [параметры] [файлы] (-h - под�казка)"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1172
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2853,7 +2872,7 @@ msgstr ""
 "Подпи�и и их проверка, шифрование и ра�шифровка\n"
 "Дей�твие по умолчанию зави�ит от входных данных\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2861,95 +2880,95 @@ msgstr ""
 "\n"
 "Поддерживают�� �ледующие алгоритмы:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Хеш-функции: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "�лгоритмы �жати�: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "вызов: %s [параметры] %s\n"
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "не�овме�тимые команды\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "в определении группы '%s' от�ут�твует знак =\n"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1698
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "Внимание: небезопа�ный владелец домашнего каталога '%s'\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "Внимание: небезопа�ный владелец файла на�троек '%s'\n"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "Внимание: небезопа�ный владелец файла модул� ра�ширени� '%s'\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "Внимание: небезопа�ные права до�тупа к домашнему каталогу '%s'\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "Внимание: небезопа�ные права до�тупа к файлу на�троек '%s'\n"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "Внимание: небезопа�ные права до�тупа к файлу модул� ра�ширени� '%s'\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "Внимание: небезопа�ный владелец каталога, �одержащего домашний каталог '%s'\n"
 
-#: g10/gpg.c:1735
+#: g10/gpg.c:1725
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "Внимание: небезопа�ный владелец каталога, �одержащего файл на�троек '%s'\n"
 
-#: g10/gpg.c:1738
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "Внимание: небезопа�ный владелец каталога,\n"
 "          �одержащего модуль ра�ширени� '%s'\n"
 
-#: g10/gpg.c:1744
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "Внимание: небезопа�ные права до�тупа к каталогу,\n"
 "          �одержащему домашний каталог '%s'\n"
 
-#: g10/gpg.c:1747
+#: g10/gpg.c:1737
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2957,482 +2976,470 @@ msgstr ""
 "В�ИМ��ИЕ: небезопа�ные права до�тупа к каталогу,\n"
 "          �одержащему файл на�троек '%s'\n"
 
-#: g10/gpg.c:1750
+#: g10/gpg.c:1740
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "Внимание: небезопа�ные права до�тупа к каталогу,\n"
 "          �одержащему файл модул� ра�ширени� '%s'\n"
 
-#: g10/gpg.c:1966
+#: g10/gpg.c:1956
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "неизве�тный �лемент в файле на�троек '%s'\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr "показывать в �пи�ке ключей фотоидентификаторы"
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 msgid "show key usage information during key listings"
 msgstr "показывать в �пи�ке ключей �ведени� о назначении ключа"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr "показывать в �пи�ке подпи�ей URL правил"
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 msgid "show all notations during signature listings"
 msgstr "показывать в �пи�ке подпи�ей в�е замечани�"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr "показывать в �пи�ке подпи�ей замечани� �тандарта IETF"
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr "показывать в �пи�ке подпи�ей пользователь�кие замечани�"
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показывать в �пи�ке подпи�ей URL предпочтительных �ерверов ключей"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr ""
 "показывать в �пи�ке ключей дей�твительно�ть идентификаторов пользователей"
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "показывать в �пи�ке ключей отозванные и про�роченные идентификаторы "
 "пользователей"
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показывать в �пи�ке ключей отозванные и про�роченные подключи"
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 msgid "show the keyring name in key listings"
 msgstr "показывать в �пи�ке ключей название таблицы ключей"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 msgid "show expiration dates during signature listings"
 msgstr "показывать в �пи�ке подпи�ей �роки дей�тви�"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "�пи�ок предпочтений (�к�пертам)"
+
+#: g10/gpg.c:2197
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "неизве�тные правила TOFU '%s'\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(\"help\" выведет �пи�ок вариантов)\n"
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Данна� команда в режиме %s недопу�тима.\n"
 
-#: g10/gpg.c:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Замечание: %s не предназначен дл� нормального применени�!\n"
 
-#: g10/gpg.c:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' - не допу�тимый �рок дей�тви� подпи�и\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" не �вл�ет�� адре�ом �лектронной почты\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "недопу�тимый режим ввода парол� '%s'\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "недопу�тимый и�точник запро�а '%s'\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' - не допу�тима� таблица �имволов\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "не могу интерпретировать URL �ервера ключей\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопу�тимые параметры �ервера ключей\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "недопу�тимые параметры �ервера ключей\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопу�тимые параметры импорта\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "недопу�тимые параметры импорта\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "недопу�тимый параметр фильтра: %s\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопу�тимые параметры �к�порта\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "недопу�тимые параметры �к�порта\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопу�тимые параметры �пи�ка\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr "недопу�тимые параметры �пи�ка\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr "показать при проверке подпи�и фотоидентификаторы"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr "показать при проверке подпи�и URL правил"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 msgid "show all notations during signature verification"
 msgstr "показать при проверке подпи�ей в�е замечани�"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr "показать при проверке подпи�ей замечани� �тандарта IETF"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr "показать при проверке подпи�ей пользователь�кие замечани�"
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "показать при проверке подпи�ей URL предпочтительных �ерверов ключей"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 msgid "show user ID validity during signature verification"
 msgstr ""
 "показать при проверке подпи�ей дей�твительно�ть идентификаторов пользователей"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "показать при проверке подпи�ей отозванные и про�роченные идентификаторы "
 "пользовател�"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "показать при проверке подпи�ей только первичный идентификатор пользовател�"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопу�тимые параметры проверки\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr "недопу�тимые параметры проверки\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запу�ка дл� %s\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопу�тимый �пи�ок auto-key-locate\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "недопу�тимый �пи�ок auto-key-locate\n"
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "недопу�тимый аргумент дл� параметра \"%.50s\"\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "Внимание: возможно �оздание файла образа пам�ти!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "Внимание: %s отмен�ет %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s � %s недопу�тимо!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s � %s не имеет �мы�ла!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "Внимание: работаем � фальшивым �и�темным временем: "
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "отказываю�ь работать � небезопа�ной пам�тью из-за %s\n"
 
-#: g10/gpg.c:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран недопу�тимый алгоритм шифровани�\n"
 
-#: g10/gpg.c:3952
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "выбрана недопу�тима� хеш-функци�\n"
-
-#: g10/gpg.c:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран недопу�тимый алгоритм �жати�\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана недопу�тима� хеш-функци� дл� �ертификации\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Замечание: про�той режим S2K (0) �трого противопоказан\n"
 
-#: g10/gpg.c:4001
+#: g10/gpg.c:3964
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопу�тимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "недопу�тимые предпочтени� по умолчанию\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "недопу�тимые личные предпочтени� шифра\n"
 
-#: g10/gpg.c:4015
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "недопу�тимые личные предпочтени� шифра\n"
-
-#: g10/gpg.c:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "недопу�тимые личные предпочтени� хеш-функции\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "недопу�тимые личные предпочтени� алгоритмов �жати�\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "неверный размер ключа; и�пользую %u бит\n"
 
-#: g10/gpg.c:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает �овме�тно � %s!\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм �жати� '%s' нельз� и�пользовать в режиме %s\n"
 
-#: g10/gpg.c:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�бой инициализации таблицы довери�: %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "В�ИМ��ИЕ: получатели (-r) заданы без и�пользовани� шифровани� � открытым "
 "ключом\n"
 
-#: g10/gpg.c:4388
+#: g10/gpg.c:4336
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "�бой �имметричного шифровани� '%s': %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt нельз� и�пользовать �овме�тно � --s2k-mode 0\n"
 
-#: g10/gpg.c:4420
+#: g10/gpg.c:4368
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "в режиме %s нельз� и�пользовать --symmetric --encrypt\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4426
 #, 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:4481
+#: g10/gpg.c:4429
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "в режиме %s нельз� и�пользовать --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�бой при отправке на �ервер ключей: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�бой при получении � �ервера ключей: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "�бой при �к�порте ключа: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "�бой при �к�порте в виде ключа ssh: %s\n"
 
-#: g10/gpg.c:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�бой при пои�ке на �ервере ключей: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�бой при обновлении � �ервера ключей: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразовани� из тек�тового формата: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразовани� в тек�товый формат: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "недопу�тима� хеш-функци� '%s'\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "ошибка �интак�иче�кого анализа �пецификации ключа '%s': %s\n"
 
-#: g10/gpg.c:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "'%s' не �вл�ет�� идентификатором, отпечатком или кодом ключа\n"
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "Внимание: команда не отдана. Пытаю�ь угадать, что имело�ь в виду ...\n"
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Пишите �ообщение ...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL правил �ертификации неверен\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL правил подпи�и неверен\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочтительного �ервера ключей неверен\n"
@@ -3445,7 +3452,7 @@ msgstr "|FILE|вз�ть ключи из файла таблицы ключей
 msgid "make timestamp conflicts only a warning"
 msgstr "при не�оответ�твии метки времени - только предупреждение"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить информацию в файл � де�криптором FD"
 
@@ -3474,157 +3481,157 @@ msgstr "Справки нет"
 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"
@@ -3633,175 +3640,175 @@ msgstr ""
 "Внимание: ключ %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:1998 g10/import.c:3146
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %s: нет идентификатора пользовател�\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, c-format
 msgid "key %s: %s\n"
 msgstr "ключ %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr "и�ключен фильтром импорта"
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "ключ %s: повреждение подключа PKS и�правлено\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2075
 #, 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:2086 g10/import.c:2117
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "ключ %s: нет дей�твительных идентификаторов пользовател�\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2088
 #, 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:2167 g10/import.c:3533
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %s: не найден открытый ключ: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2173
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "ключ %s: новый ключ - пропущен\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "ошибка запи�и таблицы ключей '%s': %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2240
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "ключ %s: импортирован открытый ключ \"%s\"\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2267
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %s: не �овпадает � нашей копией\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2335
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %s: \"%s\" 1 новый идентификатор пользовател�\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2338
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "ключ %s: \"%s\" %d новых идентификаторов пользовател�\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2341
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "ключ %s: \"%s\" 1 нова� подпи�ь\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2344
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "ключ %s: \"%s\" %d новых подпи�ей\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2347
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "ключ %s: \"%s\" 1 новый подключ\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "ключ %s: \"%s\" %d новых подключей\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "ключ %s: \"%s\" %d подпи�ь очищена\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "ключ %s: \"%s\" %d подпи�ей очищено\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "ключ %s: \"%s\" %d идентификатор пользовател� очищен\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "ключ %s: \"%s\" %d идентификаторов пользовател� очищено\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2398
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %s: \"%s\" не изменен\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2785 g10/import.c:2980
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %s: импортирован �екретный ключ\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "ключ %s: �екретный ключ уже имеет��\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2801
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "ключ %s: ошибка отправки в агент: %s\n"
@@ -3814,203 +3821,203 @@ msgstr "ключ %s: ошибка отправки в агент: %s\n"
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "Дл� перено�а '%s' выполните на каждой криптографиче�кой карте: %s\n"
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "�екретный ключ %s: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3138 g10/import.c:3177
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "импорт �екретного ключа не допу�кает��\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Идентификатор пользовател� больше не дей�твителен"
 
-#: g10/import.c:3387 g10/keylist.c:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "причина отзыва: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "по��нение к отзыву: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "ключ %s: нет открытого ключа - не могу применить �ертификат отзыва\n"
 
-#: g10/import.c:3485
+#: g10/import.c:3555
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %s: оригинальный блок ключей не найден: %s\n"
 
-#: g10/import.c:3492
+#: g10/import.c:3562
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %s: оригинальный блок ключей не читает��: %s\n"
 
-#: g10/import.c:3512
+#: g10/import.c:3582
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: недей�твительный �ертификат отзыва: %s - отвергнут\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %s: �ертификат отзыва \"%s\" импортирован\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3703
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %s: нет идентификатора пользовател� дл� подпи�и\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %s: алгоритм � открытым ключом не поддерживает��\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "ключ %s: недей�твительна� пр�ма� подпи�ь ключа\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ключ %s: нет подключа дл� �в�зывани� ключей\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3769
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %s: недопу�тима� �в�зь подключей\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3788
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %s: удалена многократна� �в�зь подключей\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3812
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %s: нет подключа дл� отзыва ключа\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %s: неверный отзыв подключа\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3840
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %s: удален многократный отзыв подключей\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3887
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %s: пропущен идентификатор пользовател� \"%s\"\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %s: пропущен подключ\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %s: �ертификат отзыва в неправильном ме�те - пропущен\n"
 
-#: g10/import.c:3902
+#: g10/import.c:3985
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %s: недей�твительный �ертификат отзыва: %s - пропущен\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4009
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %s: подпи�ь подключа в неправильном ме�те - пропущена\n"
 
-#: g10/import.c:3924
+#: g10/import.c:4017
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %s: неожиданный кла�� подпи�и (0x%02X) - пропущена\n"
 
-#: g10/import.c:4097
+#: g10/import.c:4190
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 "ключ %s: обнаружено дублирование идентификатора пользовател� - объединены\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %s: добавлен �ертификат отзыва \"%s\"\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4482
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %s: добавлена пр�ма� подпи�ь ключа\n"
@@ -4050,7 +4057,7 @@ msgstr[0] "%d повторна� подпи�ь удалена\n"
 msgstr[1] "%d повторные подпи�и удалены\n"
 msgstr[2] "%d повторных подпи�ей удалено\n"
 
-#: g10/key-check.c:726 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"
@@ -4058,7 +4065,7 @@ msgstr[0] "%d подпи�ь не проверена за от�ут�твием
 msgstr[1] "%d подпи�и не проверены за от�ут�твием ключа\n"
 msgstr[2] "%d подпи�ей не проверено за от�ут�твием ключа\n"
 
-#: g10/key-check.c:734 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"
@@ -4113,15 +4120,15 @@ msgstr "и�точник блока ключей '%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "�бой пере�о�тавлени� буфера таблицы ключей: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[revocation]"
 msgstr "[отзыв]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[�амоподпи�ь]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4132,17 +4139,17 @@ msgstr ""
 "до�товерно�ти ключей других пользователей (провер�ет па�порт,\n"
 "�вер�ет отпечатки ключей из разных и�точников и т.п.)\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 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:390 g10/pkclist.c:291
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr " %d = Полно�тью довер�ю\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:408
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4152,53 +4159,53 @@ msgstr ""
 "позвол�ет ключу, который Вы подпи�ываете, делать подпи�и довери�\n"
 "от Вашего имени.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:425
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Введите домен, ограничивающий и�пользование данной подпи�и, или пу�тую "
 "�троку, е�ли нет ограничений.\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 "Идентификатор пользовател� \"%s\" пропущен: �то не тек�товый идентификатор.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  �е могу подпи�ать.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Срок дей�тви� идентификатора пользовател� \"%s\" и�тек."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Идентификатор пользовател� \"%s\" не �амозаверен."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Идентификатор пользовател� \"%s\" можно подпи�ать."
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr "Подпи�ать его? (y/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4207,11 +4214,11 @@ msgstr ""
 "Самоподпи�ь у \"%s\" -\n"
 "�то подпи�ь типа PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4220,11 +4227,11 @@ msgstr ""
 "Ваша текуща� подпи�ь на \"%s\"\n"
 "про�рочена.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4233,44 +4240,44 @@ msgstr ""
 "Ваша текуща� подпи�ь на \"%s\"\n"
 "�вл�ет�� локальной.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "Вы хотите преобразовать ее в полную �к�портируемую подпи�ь? (y/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:748
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" уже локально подпи�ан ключом %s\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" уже подпи�ан ключом %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:758
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Вы в�е равно хотите �нова подпи�ать его? (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "�ечего подпи�ывать ключом %s\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:804
 msgid "This key has expired!"
 msgstr "Данный ключ про�рочен!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Срок дей�тви� данного ключа и�текает %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr ""
 "Вы хотите, чтобы Ваша подпи�ь была дей�твительна до того же времени? (Y/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4279,31 +4286,31 @@ msgstr ""
 "�а�колько хорошо Вы проверили, что ключ дей�твительно принадлежит\n"
 "указанному выше человеку? Е�ли не знаете, что ответить, введите \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) �е буду отвечать.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) �икакой проверки не было.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Была ча�тична� проверка.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:881
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Проверка была очень тщательной.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:888
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Ваш выбор? (введите '?' дл� получени� информации): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4312,235 +4319,235 @@ msgstr ""
 "Вы уверены, что хотите подпи�ать �тот ключ\n"
 "�воим ключом \"%s\" (%s)?\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 msgid "This will be a self-signature.\n"
 msgstr "Это будет �амоподпи�ь.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "Внимание: подпи�ь не будет помечена как не�к�портируема�.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "Внимание: подпи�ь не будет помечена как неотзываема�.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:945
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Подпи�ь будет помечена как не�к�портируема�.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:952
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Подпи�ь будет помечена как неотзываема�.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "I have not checked this key at all.\n"
 msgstr "Этот ключ мной никак не провер�л��.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 msgid "I have checked this key casually.\n"
 msgstr "Мной проведена поверхно�тна� проверка �того ключа.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 msgid "I have checked this key very carefully.\n"
 msgstr "Этот ключ проверен мной очень тщательно.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:981
 msgid "Really sign? (y/N) "
 msgstr "Дей�твительно подпи�ать? (y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "подпи�ать не удало�ь: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 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:1152
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "ключ %s: ошибка изменени� фразы-парол�: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "save and quit"
 msgstr "�охранить и выйти"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 msgid "show key fingerprint"
 msgstr "показать отпечаток ключа"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "show the keygrip"
 msgstr "показать код ключа"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "выве�ти �пи�ок ключей и идентификаторов пользовател�"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "выбрать идентификатор пользовател� N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr "выбрать подключ N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr "проверка подпи�ей"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "подпи�ать выбранные идентификаторы пользовател� [* опи�ание команд �м. ниже]"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "sign selected user IDs locally"
 msgstr "локально подпи�ать выбранные идентификаторы пользовател�"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 msgid "sign selected user IDs with a trust signature"
 msgstr "подпи�ать выбранные идентификаторы пользовател� подпи�ью довери�"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "подпи�ать выбранные идентификаторы пользовател� без возможно�ти отзыва"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "add a user ID"
 msgstr "добавить идентификатор пользовател�"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "добавить фотоидентификатор"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr "удалить выбранные идентификаторы пользовател�"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr "добавить подключ"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr "добавить ключ на криптографиче�кую карту"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr "переме�тить ключ на криптографиче�кую карту"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr "переме�тить архивный ключ на криптографиче�кую карту"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 msgid "delete selected subkeys"
 msgstr "удалить выбранные подключи"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "добавить ключ отзыва"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 msgid "delete signatures from the selected user IDs"
 msgstr "удалить подпи�и � выбранных идентификаторов пользовател�"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1314
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "�менить �рок дей�тви� ключа или выбранных подключей"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1316
 msgid "flag the selected user ID as primary"
 msgstr "пометить выбранный идентификатор пользовател� как первичный"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "�пи�ок предпочтений (�к�пертам)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "�пи�ок предпочтений (подробный)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "у�тановить �пи�ок предпочтений дл� выбранных идентификаторов пользовател�"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1325
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "у�тановить URL предпочтительного �ервера ключей дл� выбранных "
 "идентификаторов пользовател�"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1327
 msgid "set a notation for the selected user IDs"
 msgstr "у�тановить замечание дл� выбранных идентификаторов пользовател�"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1329
 msgid "change the passphrase"
 msgstr "�менить фразу-пароль"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "изменить уровень довери� владельцу"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 msgid "revoke signatures on the selected user IDs"
 msgstr "отозвать подпи�и у выбранных идентификаторов пользовател�"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 msgid "revoke selected user IDs"
 msgstr "отозвать выбранные идентификаторы пользовател�"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "revoke key or selected subkeys"
 msgstr "отозвать ключ или выбранные подключи"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "enable key"
 msgstr "подключить ключ"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr "отключить ключ"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr "показать выбранные фотоидентификаторы"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "�жать непригодные идентификаторы пользователей и удалить непригодные подпи�и "
 "из ключа"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1349
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "�жать непригодные идентификаторы пользователей и удалить в�е подпи�и из ключа"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1470
 msgid "Secret key is available.\n"
 msgstr "Секретный ключ до�тупен.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 msgid "Secret subkeys are available.\n"
 msgstr "Секретные подключи до�тупны.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1574
 msgid "Need the secret key to do this.\n"
 msgstr "Дл� данного дей�тви� нужен �екретный ключ.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4551,264 +4558,248 @@ msgstr ""
 "  't' (подпи�и довери�, tsign), 'nr' (неотзываемые, \n"
 "  nrsign) или любое их �очетание (ltsign, tnrsign и т.д.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "Ключ отозван."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Really sign all text user IDs? (y/N) "
 msgstr ""
 "Дей�твительно подпи�ать в�е тек�товые идентификаторы пользовател�? (y/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1682
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Дей�твительно подпи�ать в�е идентификаторы пользовател�? (y/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1690
 msgid "Hint: Select the user IDs to sign\n"
 msgstr ""
 "Под�казка: Выберите идентификаторы пользователей, которые нужно подпи�ать\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Команда '%s'.)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 msgid "You can't delete the last user ID!\n"
 msgstr "Вы не можете удалить по�ледний идентификатор пользовател�!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1755
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 "Дей�твительно удалить в�е выбранные идентификаторы пользователей? (y/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 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:1814 g10/keyedit.c:1854
 msgid "Really move the primary key? (y/N) "
 msgstr "Дей�твительно переме�тить первичный ключ? (y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 msgid "You must select exactly one key.\n"
 msgstr "Вы должны выбрать хот� бы один ключ.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 msgid "Command expects a filename argument\n"
 msgstr "Команде нужен аргумент-им� файла\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "�е могу открыть '%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Ошибка чтени� архивного ключа из '%s': %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1969
 msgid "You must select at least one key.\n"
 msgstr "Вы должны выбрать хот� бы один ключ.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1975
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Вы дей�твительно хотите удалить выбранные ключи? (y/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Вы дей�твительно хотите удалить данный ключ? (y/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2015
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Дей�твительно отозвать в�е выбранные идентификаторы пользователей? (y/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2016
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Дей�твительно отозвать данный идентификатор пользовател�? (y/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2034
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Вы дей�твительно хотите отозвать ключ целиком? (y/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2045
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Вы дей�твительно хотите отозвать выбранные подключи? (y/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2047
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Вы дей�твительно хотите отозвать данный подключ? (y/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2105
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "�ельз� при�ваивать �тепень довери�, когда таблица довери� указана "
 "пользователем\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2150
 msgid "Set preference list to:\n"
 msgstr "У�тановить предпочтени�, равные:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Дей�твительно обновить предпочтени� дл� выбранных идентификаторов "
 "пользователей? (y/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2159
 msgid "Really update the preferences? (y/N) "
 msgstr "Дей�твительно обновить предпочтени�? (y/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Save changes? (y/N) "
 msgstr "Сохранить изменени�? (y/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без �охранени�? (y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Ключ не измен�л�� - обновление не нужно.\n"
 
-#: g10/keyedit.c:2557
+#: g10/keyedit.c:2558
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "нельз� удал�ть по�ледний дей�твительный идентификатор пользовател�.\n"
 
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2584
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "�бой отзыва идентификатора пользовател�: %s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "�бой у�тановки первичного идентификатора пользовател�: %s\n"
 
-#: g10/keyedit.c:2677
+#: g10/keyedit.c:2717
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" - не отпечаток\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" - не первичный отпечаток\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "�едопу�тимый идентификатор пользовател� '%s': %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "No matching user IDs."
 msgstr "�ет подход�щих идентификаторов пользователей."
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "Nothing to sign.\n"
 msgstr "Подпи�ывать нечего.\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Вами не подпи�ано.\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "�бой проверки �озданной подпи�и: %s\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3251
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' - не допу�тимый �рок дей�тви�\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" - не правильный отпечаток\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "подключ \"%s\" не найден\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr "AEAD: "
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Хеш: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Характери�тики: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr "�е измен�ть на �ервере"
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Предпочтительный �ервер ключей: "
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr "Замечани�: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "В идентификаторе пользовател� типа PGP 2.x не может быть предпочтений.\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3735
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Следующий ключ был отозван %s пользователем %s ключом %s\n"
 
-#: g10/keyedit.c:3867
+#: g10/keyedit.c:3759
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван пользователем %s ключом %s"
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr "(о�обо важный)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "     �оздан: %s"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr "    отозван: %s"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr "про�рочен �: %s"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
@@ -4817,30 +4808,30 @@ msgstr "   годен до: %s"
 # perhaps this should be somewhere in help/man
 # (S - подпи�ь, C - �ертификаци�, E - шифрование, A - удо�товерение лично�ти)
 # too long for repeating messages.
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr "назначение: %s"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr "номер карты: "
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr "доверие: %s"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr "до�товерно�ть: %s"
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4848,18 +4839,18 @@ msgstr ""
 "Учтите, что показанна� до�товерно�ть ключа может быть неверной,\n"
 "пока Вы не перезапу�тите программу.\n"
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "про�рочен"
 
 # check it
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4869,17 +4860,17 @@ msgstr ""
 "          Эта команда может приве�ти к тому, что первичным �танет �читать��\n"
 "          другой идентификатор пользовател�.\n"
 
-#: g10/keyedit.c:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "Внимание: Срок дей�тви� Вашего подключа дл� шифровани� и�текает.\n"
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Возможно, надо помен�ть также �рок дей�тви�.\n"
 
-#: g10/keyedit.c:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4888,37 +4879,37 @@ msgstr ""
 "Внимание: Это ключ типа PGP2. Добавление фотоидентификатора может\n"
 "          в некоторых вер�и�х PGP вызвать отбраковку ключа.\n"
 
-#: g10/keyedit.c:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить �то? (y/N) "
 
-#: g10/keyedit.c:4324
+#: g10/keyedit.c:4216
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "�ельз� добавить фотоидентификатор в ключ типа PGP2.\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4231
 #, 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:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную дей�твительную подпи�ь? (y/N/q)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недей�твительную подпи�ь? (y/N/q)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизве�тную подпи�ь? (y/N/q)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Дей�твительно удалить данную �амоподпи�ь? (y/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4926,20 +4917,20 @@ msgstr[0] "Удалена %d подпи�ь.\n"
 msgstr[1] "Удалены %d подпи�и.\n"
 msgstr[2] "Удалено %d подпи�ей.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "�ичего не удалено.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "недопу�тим"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Идентификатор пользовател� \"%s\" �жат: %s\n"
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4947,17 +4938,17 @@ msgstr[0] "Идентификатор пользовател� \"%s\": %d под
 msgstr[1] "Идентификатор пользовател� \"%s\": %d подпи�и удалены\n"
 msgstr[2] "Идентификатор пользовател� \"%s\": %d подпи�ей удалено\n"
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Идентификатор пользовател� \"%s\" уже минимизирован\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Идентификатор пользовател� \"%s\": уже очищен\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4966,39 +4957,39 @@ msgstr ""
 "Внимание: Это ключ типа PGP 2.x. Добавление о�обого отзывающего ключа\n"
 "          может в некоторых вер�и�х PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "�ельз� добавить о�обый отзывающий ключ в ключ типа PGP 2.x.\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите идентификатор пользовател� ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельз� назначить отзывающим ключ типа PGP 2.x\n"
 
-#: g10/keyedit.c:4673
+#: g10/keyedit.c:4565
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим �амого �еб�\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4587
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "�тот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4605
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "Внимание: назначение ключа отзывающим невозможно отменить!\n"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4611
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N) "
 
-#: g10/keyedit.c:4788
+#: g10/keyedit.c:4680
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -5006,173 +4997,173 @@ msgstr ""
 "Вы уверены, что хотите изменить �рок дей�тви� �разу не�кольких подключей? (y/"
 "N) "
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена �рока дей�тви� подключа.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена �рока дей�тви� первичного ключа.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "�ельз� изменить �рок дей�тви� ключа v3\n"
 
-#: g10/keyedit.c:4912
+#: g10/keyedit.c:4804
 msgid "Changing usage of a subkey.\n"
 msgstr "Смена режимов и�пользовани� подключа.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 msgid "Changing usage of the primary key.\n"
 msgstr "Смена режимов и�пользовани� первичного ключа.\n"
 
-#: g10/keyedit.c:5033
+#: g10/keyedit.c:4925
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "подпи�ывающий подключ %s уже перекре�тно заверен\n"
 
-#: g10/keyedit.c:5039
+#: g10/keyedit.c:4931
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "подключ %s не дл� подпи�ей, он не нуждает�� в перекре�тном заверении\n"
 
-#: g10/keyedit.c:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите ровно один идентификатор пользовател�.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропу�к �амоподпи�и v3 на идентификаторе пользовател� \"%s\"\n"
 
-#: g10/keyedit.c:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтительного �ервера ключей: "
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Вы дей�твительно хотите заменить его? (y/N) "
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Вы дей�твительно хотите удалить его? (y/N) "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 msgid "Enter the notation: "
 msgstr "Введите замечание: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 msgid "Proceed? (y/N) "
 msgstr "Продолжить? (y/N) "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "�ет идентификатора пользовател� � индек�ом %d\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "�ет идентификатора пользовател� � хешем %s\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "�ет подключа � идентификатором ключа '%s'.\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "�ет подключа � индек�ом %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Идентификатор пользовател�: \"%s\"\n"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подпи�ано Вашим ключом %s %s%s%s\n"
 
-#: g10/keyedit.c:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (не�к�портируема�)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок дей�тви� подпи�и и�тек %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать �ертификат отзыва дл� данной подпи�и? (y/N) "
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подпи�али �ти идентификаторы пользователей на ключе %s:\n"
 
-#: g10/keyedit.c:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr " (неотзываема�)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отозвано Вашим ключом %s %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете �ледующие подпи�и:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Дей�твительно �оздать �ертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "нет �екретного ключа\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "попытка отзыва непользователь�кого идентификатора: %s\n"
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Идентификатор пользовател� \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "Внимание: подпи�ь идентификатора пользовател� датирована %d �екундами в "
 "будущем\n"
 
-#: g10/keyedit.c:6426
+#: g10/keyedit.c:6320
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "�ельз� удал�ть по�ледний дей�твительный идентификатор пользовател�.\n"
 
-#: g10/keyedit.c:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван.\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван.\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5215,33 +5206,33 @@ msgstr "�лишком много предпочтений шифров\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "недопу�тимый �лемент '%s' в �троке предпочтений\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "запи�ь пр�мой подпи�и\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "запи�ь �амоподпи�и\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "запи�ь �в�зующей подпи�и\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "неверный размер ключа; и�пользую %u бит\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "размер ключа округлен вверх до %u бит\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5249,19 +5240,19 @@ msgstr ""
 "Внимание: некоторые реализации OpenPGP не могут обрабатывать ключи DSA � "
 "такой длиной хеша\n"
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr "Подпи�ать"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr "Заверить"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr "Зашифровать"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr "Удо�товерить лично�ть"
 
@@ -5275,180 +5266,180 @@ msgstr "Удо�товерить лично�ть"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr "11223300"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Возможные дей�тви� дл� ключа %s: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr "Допу�тимы дей�тви�: "
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Переключить возможно�ть подпи�и\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Переключить возможно�ть шифровани�\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Переключить возможно�ть удо�товерени� лично�ти\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Завершено\n"
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, 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:2131
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA и Elgamal\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (только дл� подпи�и)\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2113
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (только дл� подпи�и)\n"
 
-#: g10/keygen.c:2142
+#: g10/keygen.c:2119
 #, fuzzy, c-format
 #| msgid "   (%d) Elgamal (encrypt only)\n"
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (только дл� шифровани�)\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (только дл� шифровани�)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2127
 #, 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:2152
+#: g10/keygen.c:2129
 #, 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:2158
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid "   (%d) sign, encrypt\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) подпи�ь, шифрование\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (только дл� подпи�и)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, 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:2163
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC (только дл� шифровани�)\n"
 
-#: g10/keygen.c:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) Имеющий�� ключ\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card%s\n"
 msgstr "  (%d) Имеющий�� на карте ключ\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Введите код ключа:"
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "�ет ключа � таким кодом\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Серийный номер карты: %s\n"
 
-#: g10/keygen.c:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "До�тупные ключи:\n"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "округлен до %u бит\n"
 
-#: g10/keygen.c:2570
+#: g10/keygen.c:2547
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "длина ключей %s может быть от %u до %u.\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2555
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Какой размер подключа необходим? (%u) "
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запрошенный размер ключа - %u бит\n"
 
-#: g10/keygen.c:2641
+#: g10/keygen.c:2618
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Выберите �ллиптиче�кую кривую:\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5464,7 +5455,7 @@ msgstr ""
 "      <n>m = �рок дей�тви� ключа - n ме��цев\n"
 "      <n>y = �рок дей�тви� ключа - n лет\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5480,38 +5471,38 @@ msgstr ""
 "      <n>m = �рок дей�тви� подпи�и - n ме��цев\n"
 "      <n>y = �рок дей�тви� подпи�и - n лет\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Срок дей�тви� ключа? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Срок дей�тви� подпи�и? (%s) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "недопу�тимое значение\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr "Срок дей�тви� ключа не ограничен\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr "Срок дей�тви� подпи�и не ограничен\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ дей�твителен до %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпи�ь дей�твительна до %s\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5519,11 +5510,11 @@ msgstr ""
 "Ваша �и�тема не может отображать даты по�ле 2038 года.\n"
 "Однако даты до 2106 года будут обрабатывать�� верно.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr "В�е верно? (y/N) "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5537,7 +5528,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5553,41 +5544,41 @@ msgstr ""
 "    \"Ва�� Пушкин (пер�онаж) <vp@test.ru>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Ваше полное им�: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "�едопу�тимый �имвол в имени\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "Символы '%s' и '%s' в имени по�вл�ть�� не могут\n"
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "�дре� �лектронной почты: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "�еправильный адре� �лектронной почты\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Примечание: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "�едопу�тимый �имвол в примечании\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "И�пользует�� таблица �имволов '%s'.\n"
 
-#: g10/keygen.c:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5598,12 +5589,12 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "�е в�тавл�йте адре� �лектронной почты в им� пользовател� или примечание\n"
 
-#: g10/keygen.c:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Такой идентификатор пользовател� на �том ключе уже е�ть!\n"
 
@@ -5618,31 +5609,31 @@ msgstr "Такой идентификатор пользовател� на �т
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Сменить (N)Им�, (C)Примечание, (E)�дре�; (Q)Выход? "
 
-#: g10/keygen.c:3142
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Сменить (N)Им�, (C)Примечание, (E)�дре�; (O)Прин�ть/(Q)Выход? "
 
-#: g10/keygen.c:3147
+#: g10/keygen.c:3124
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Сменить (N)Им�, (E)�дре�; (Q)Выход? "
 
-#: g10/keygen.c:3148
+#: g10/keygen.c:3125
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Сменить (N)Им�, (E)�дре�; (O)Прин�ть/(Q)Выход? "
 
-#: g10/keygen.c:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Сначала и�правьте ошибку\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5655,18 +5646,18 @@ msgstr ""
 "�лучайных чи�ел больше возможно�тей получить до�таточное количе�тво "
 "�нтропии.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при �оздании ключа: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5677,65 +5668,65 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr "Продолжить? (Y/n) "
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Ключ пользовател� \"%s\" уже �уще�твует\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 msgid "Create anyway? (y/N) "
 msgstr "В�е равно �оздать новый? (y/N) "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, c-format
 msgid "creating anyway\n"
 msgstr "принудительное �оздание\n"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 "Замечание: \"%s %s\" вызывает полнофункциональный диалог �оздани� ключа.\n"
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Создание ключа прервано.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "не могу �оздать архивную копию, файл '%s': %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Замечание: архивна� копи� ключа � карты �охранена в '%s'\n"
 
-#: g10/keygen.c:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "�охранение открытого ключа в '%s'\n"
 
-#: g10/keygen.c:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "нет до�тупной дл� запи�и таблицы открытых ключей: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "ошибка запи�и таблицы открытых ключей '%s': %s\n"
 
-#: g10/keygen.c:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и �екретный ключи �озданы и подпи�аны.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 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"
@@ -5743,7 +5734,7 @@ msgstr ""
 "Учтите, что данный ключ не может и�пользовать�� дл� шифровани�. Можно\n"
 "во�пользовать�� командой \"--edit-key\" и �оздать подключ дл� �тих целей.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5751,7 +5742,7 @@ msgstr ""
 "ключ �оздан на %lu �екунду в будущем (петл� во времени или проблемы � "
 "ча�ами)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5759,22 +5750,22 @@ msgstr ""
 "ключ �оздан на %lu �екунд в будущем (петл� во времени или проблемы � "
 "ча�ами)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "Замечание: �оздание подключей дл� ключей v3 не �овме�тимо � OpenPGP\n"
 
-#: g10/keygen.c:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретные ча�ти первичного ключа от�ут�твуют.\n"
 
-#: g10/keygen.c:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретные ча�ти первичного ключа хран�т�� на карте.\n"
 
-#: g10/keygen.c:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr "Дей�твительно �оздать? (y/N) "
 
@@ -5782,27 +5773,43 @@ msgstr "Дей�твительно �оздать? (y/N) "
 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"
@@ -5810,7 +5817,7 @@ msgstr[0] "%d хороша� подпи�ь\n"
 msgstr[1] "%d хороших подпи�и\n"
 msgstr[2] "%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"
@@ -5818,7 +5825,7 @@ msgstr[0] "%d подпи�ь не проверена из-за ошибки\n"
 msgstr[1] "%d подпи�и не проверены из-за ошибки\n"
 msgstr[2] "%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"
@@ -5826,33 +5833,33 @@ msgstr[0] "Внимание: %lu ключ пропущен из-за большÐ
 msgstr[1] "Внимание: %lu ключа пропущены из-за большого размера\n"
 msgstr[2] "Внимание: %lu ключей пропущено из-за большого размера\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Таблица ключей"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Отпечаток первичного ключа:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr " Отпечаток первичного ключа:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "       Отпечаток подключа:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr "      Отпечаток ключа ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr " �ерийный номер карты ="
 
@@ -6227,7 +6234,7 @@ msgstr "двоичный"
 msgid "textmode"
 msgstr "тек�товый"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "неизве�тно"
 
@@ -6367,27 +6374,27 @@ msgstr "Без �жати�"
 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:1614
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "неоднозначный параметр '%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "неизве�тный параметр '%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "неизве�тный �лабый хеш '%s'\n"
@@ -6507,7 +6514,7 @@ msgstr ""
 "�оздан %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6521,70 +6528,70 @@ msgstr ""
 "Помните, что изображение будет хранить�� в Вашем открытом ключе и увеличит\n"
 "его размер! Рекомендует�� размер около 240x288.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Введите им� файла JPEG дл� фотоидентификатора: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "не могу открыть файл JPEG '%s': %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:239
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Этот JPEG очень велик (%d байт)!\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:241
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Вы дей�твительно хотите и�пользовать его? (y/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:257
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "'%s' - не файл JPEG\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Это правильна� фотографи�? (y/N/q) "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "удаленный запу�к программы не поддерживает��\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:593
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "на данной платформе при вызове внешних программ требуют�� временные файлы\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "ненормальное завершение внешней программы\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "ошибка �и�темы при вызове внешней программы: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:707
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "Внимание: не могу удалить временный файл (%s) '%s': %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:711
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "Внимание: не могу удалить временный каталог '%s': %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6592,7 +6599,7 @@ msgstr ""
 "вызов внешних программ отключен из-за небезопа�ных прав до�тупа к файлу "
 "на�троек\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "не могу отобразить фотоидентификатор!\n"
@@ -6913,12 +6920,12 @@ msgstr "неизве�тный получатель по умолчанию \"%s
 msgid "no valid addressees\n"
 msgstr "нет пригодных адре�ов\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Замечание: у ключа %s нет функции %s\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Замечание: у ключа %s нет предпочтени� дл� %s\n"
@@ -8012,7 +8019,7 @@ msgstr "и�пользую модель довери� %s\n"
 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"
@@ -8042,7 +8049,7 @@ msgstr "выполните --check-trustdb, пожалуй�та\n"
 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"
@@ -8050,7 +8057,7 @@ msgstr[0] "обработан %d ключ"
 msgstr[1] "обработаны %d ключа"
 msgstr[2] "обработано %d ключей"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
@@ -8058,17 +8065,17 @@ msgstr[0] " (�брошен %d �четчик до�товерно�ти)\n"
 msgstr[1] " (�брошены %d �четчика до�товерно�ти)\n"
 msgstr[2] " (�брошено %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"
@@ -8076,7 +8083,7 @@ 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 ""
@@ -8202,7 +8209,7 @@ msgstr ""
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8210,7 +8217,7 @@ msgstr "%s�омер: %s%%0AДержатель: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8252,7 +8259,7 @@ msgstr "|A|Введите админи�тративный PIN"
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "|P|Введите код разблокировки PIN (PUK) дл� �тандартных ключей."
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8340,58 +8347,58 @@ msgstr[2] "�оздание ключа завершено (%d �екунд)\n"
 msgid "response does not contain the public key data\n"
 msgstr "ответ не �одержит данных открытого ключа\n"
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Введите админи�тративный PIN"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "|A|Введите PIN дл� �тандартных ключей."
 
-#: scd/app-nks.c:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Модули RSA пропущены, или их размер не равен %d бит\n"
 
-#: scd/app-nks.c:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "от�ут�твует открыта� �к�понента RSA, или ее размер превышает %d бит\n"
 
-#: scd/app-nks.c:1654
+#: 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:1701
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "пу�той PIN до �их пор не изменен\n"
 
-#: scd/app-nks.c:2074
+#: scd/app-nks.c:2088
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|A|Введите новый PIN дл� �тандартных ключей."
 
-#: scd/app-nks.c:2082
+#: 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:2092
+#: 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:2102
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8399,7 +8406,7 @@ msgstr ""
 "|NP|Введите новый код разблокировки PIN (PUK) ключа дл� �оздани� "
 "квалифицированных подпи�ей."
 
-#: scd/app-nks.c:2104
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8407,7 +8414,7 @@ msgstr ""
 "|P|Введите код разблокировки PIN (PUK) ключа дл� �оздани� квалифицированных "
 "подпи�ей."
 
-#: scd/app-nks.c:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "ошибка при получении нового PIN: %s\n"
@@ -8669,13 +8676,13 @@ msgstr "обработчик fd %d запущен\n"
 msgid "handler for fd %d terminated\n"
 msgstr "обработчик fd %d о�тановлен\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8684,11 +8691,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr "�хема проверки, запрошенна� �ертификатом: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:199 sm/certchain.c:2211
 msgid "chain"
 msgstr "цепь"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 msgid "shell"
 msgstr "оболочка"
 
@@ -8711,238 +8718,238 @@ msgstr "незаданные правила помечены как критич
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "�бой получени� отпечатка\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "внешний пои�к издател�\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "чи�ло �оответ�твующих издателей: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "не могу получить authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:793
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "пои�к издател� в буфере Dirmngr\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:818
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "чи�ло �оответ�твующих �ертификатов: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "�бой при выделении пам�ти под указатель на базу данных\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1260 sm/certchain.c:1264
 msgid "certificate has been revoked"
 msgstr "�ертификат был отозван"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr "�тату� �ертификата неизве�тен"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "проверьте, что \"dirmngr\" у�тановлен корректно\n"
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr "�ертификат еще не до�товерен"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 msgid "root certificate not yet valid"
 msgstr "корневой �ертификат еще не до�товерен"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr "промежуточный �ертификат еще не до�товерен"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr "�ертификат про�рочен"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 msgid "root certificate has expired"
 msgstr "корневой �ертификат про�рочен"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 msgid "intermediate certificate has expired"
 msgstr "промежуточный �ертификат про�рочен"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "�ертификат не имеет требуемых атрибутов: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1404
 msgid "certificate with invalid validity"
 msgstr "�ертификат � недей�твительной до�товерно�тью"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr "подпи�ь �оздана вне времени дей�тви� �ертификата"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr "�ертификат �оздан вне времени дей�тви� издател�"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "промежуточный �ертификат �оздан вне времени дей�тви� издател�"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (          подпи�ь �оздана "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (        �ертификат �оздан "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (�ертификат дей�твителен � "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (  издатель дей�твителен � "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "отпечаток=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "корневой �ертификат теперь помечен как доверенный\n"
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1505
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "в агенте gpg нельз� интерактивно �делать �ертификат доверенным\n"
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1511
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 "дл� данного �еан�а запрещено интерактивно делать �ертификат доверенным\n"
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "Внимание: врем� �оздани� подпи�и неизве�тно - предполагает�� текущий момент"
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 msgid "no issuer found in certificate"
 msgstr "в �ертификате не найден издатель"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 msgid "self-signed certificate has a BAD signature"
 msgstr "у �амозаверенного �ертификата ПЛОХ�Я подпи�ь"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "корневой �ертификат не помечен как доверенный"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "�бой проверки �пи�ка довери�: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "�лишком длинна� цепочка �ертификатов\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr "не найден издатель �ертификата"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "�ертификат имеет ПЛОХУЮ подпи�ь"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1911 dirmngr/validate.c:693
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 "найден еще один возможный �ертификат удо�товер�ющего центра - повторна� "
 "попытка"
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr "хороший �ертификат\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "хороший промежуточный �ертификат\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, c-format
 msgid "root certificate is good\n"
 msgstr "хороший корневой �ертификат\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr "переключение на цепную �хему"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr "и�пользует�� �хема проверки: %s"
@@ -8965,7 +8972,7 @@ msgstr "нехватка выделенной пам�ти\n"
 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:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "нет"
 
@@ -8999,42 +9006,42 @@ msgstr ""
 "S/N %s, идентификатор 0x%08lX,\n"
 "�оздан %s, и�текает %s.\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "не задана применимо�ть ключа - подразумеваем в�е\n"
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "�ертификат не �ледовало и�пользовать дл� заверени�\n"
 
-#: sm/certlist.c:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "�ертификат не �ледовало и�пользовать дл� подпи�ывани� ответа OCSP\n"
 
-#: sm/certlist.c:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "�ертификат не �ледовало и�пользовать дл� шифровани�\n"
 
-#: sm/certlist.c:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "�ертификат не �ледовало и�пользовать дл� подпи�ей\n"
 
-#: sm/certlist.c:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "�ертификат не пригоден дл� шифровани�\n"
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "�ертификат не пригоден дл� подпи�и\n"
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9591,7 +9598,7 @@ msgstr "хеш-функци� дл� пользовател� %d: %s (%s)\n"
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "�бой при проверке квалифицированной подпи�и: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
@@ -9783,7 +9790,7 @@ msgstr "удаление файла буфера '%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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "ошибка закрыти� файла буфера: %s\n"
@@ -10041,143 +10048,143 @@ msgstr "недопу�тима� хеш-функци� '%s'\n"
 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:1849 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "�бой �оздани� S-выражени�: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1923
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "�бой ksba_crl_parse: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1938
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr ""
 "ошибка получени� времен обновлени� �пи�ка отозванных �ертификатов: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1945
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 "времена обновлени� �того �пи�ка отозванных �ертификатов: текущее=%s, "
 "�ледующее=%s\n"
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "не задано nextUpdate; предполагаю �рок дей�тви� в один день\n"
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "ошибка получени� �лемента �пи�ка отозванных �ертификатов: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1984
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "ошибка в�тавки �лемента во временный файл буфера: %s\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2011
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "в �пи�ке отозванных �ертификатов не найден издатель �пи�ка: %s\n"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 "пои�к �ертификата издател� �пи�ка отозванных �ертификатов по "
 "authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "�бой проверки подпи�и �пи�ка отозванных �ертификатов: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2084
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr ""
 "ошибка проверки до�товерно�ти �ертификата издател� �пи�ка отозванных "
 "�ертификатов: %s\n"
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2226
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "�бой ksba_crl_new: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2233
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "�бой ksba_crl_set_reader: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2267
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "удален залипший временный файл буфера '%s'\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2271
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "проблема удалени� залипшего временного файла буфера '%s': %s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "ошибка �оздани� временного файла буфера '%s': %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2291
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "�бой crl_parse_insert: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "ошибка завершени� временного файла буфера '%s': %s\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2308
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "ошибка закрыти� временного файла буфера '%s': %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2333
 #, 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:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 "новый �пи�ок отозванных �ертификатов тоже �лишком �тар; �рок дей�тви� и�тек "
 "%s\n"
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "неизве�тное критиче�кое ра�ширение �пи�ка отозванных �ертификатов %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "ошибка чтени� ра�ширений �пи�ка отозванных �ертификатов: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2414
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "�оздание файла буфера '%s'\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "проблема при переименовании '%s' в '%s': %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2460
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10186,12 +10193,12 @@ msgstr ""
 "�бой обновлени� файла каталога - запи�ь буфера будет утер�на при �ледующем "
 "запу�ке программы\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "�ачало вывода �пи�ка отозванных �ертификатов (полученного через %s)\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10199,57 +10206,57 @@ msgstr ""
 " Ошибка: Спи�ок отозванных �ертификатов и�пользован не будет, потому что "
 "по�ле обновлени� он в�е равно �лишком �тар!\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2523
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 " Ошибка: Спи�ок отозванных �ертификатов не будет и�пользован из-за "
 "неизве�тного критиче�кого ра�ширени�!\n"
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr " Ошибка: Спи�ок отозванных �ертификатов и�пользован не будет\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 " Ошибка: Этот �пи�ок отозванных �ертификатов в буфере, возможно, подменен!\n"
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr "Внимание: найдена недопу�тима� длина буферной запи�и\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2558
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "проблема при чтении буферной запи�и: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2569
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "проблема при чтении ключа буфера: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2600
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "ошибка чтени� запи�и буфера из базы данных: %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2603
 msgid "End CRL dump\n"
 msgstr "Конец вывода �пи�ка отозванных �ертификатов\n"
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "�бой crl_fetch через DP: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "�бой crl_cache_insert через DP: %s\n"
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "�бой crl_cache_insert через издател�: %s\n"
@@ -10607,12 +10614,12 @@ msgstr "вызов: %s [параметры] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "двоеточи� в имени �окета недопу�тимы\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "�бой при получении �пи�ка отозванных �ертификатов из '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "�бой обработки �пи�ка отозванных �ертификатов из '%s': %s\n"
@@ -10858,91 +10865,91 @@ msgstr "�бой получени� хеша ответа OCSP дл� '%s': %s\n
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "не подпи�ано о�новным �ертификатом подпи�ывающего OCSP"
 
-#: dirmngr/ocsp.c:582
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "�бой размещени� �лемента �пи�ка: %s\n"
 
-#: dirmngr/ocsp.c:598 dirmngr/ocsp.c:782
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "ошибка при получении идентификатора ответчика: %s\n"
 
-#: dirmngr/ocsp.c:642
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "не найдено подход�щего �ертификата дл� проверки ответа OCSP\n"
 
-#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "не найден �ертификат издател�: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "вызывавший не вернул целевой �ертификат\n"
 
-#: dirmngr/ocsp.c:698
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "вызывавший не вернул издающий �ертификат\n"
 
-#: dirmngr/ocsp.c:708
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "�бой при выделении пам�ти под контек�т OCSP: %s\n"
 
-#: dirmngr/ocsp.c:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "не определен о�новной ответчик OCSP\n"
 
-#: dirmngr/ocsp.c:753
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "не определен о�новной подпи�ывающий в OCSP\n"
 
-#: dirmngr/ocsp.c:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "и�пользует�� о�новной ответчик OCSP '%s'\n"
 
-#: dirmngr/ocsp.c:765
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "и�пользует�� ответчик OCSP '%s'\n"
 
-#: dirmngr/ocsp.c:822
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "ошибка получени� �тату�а OCSP дл� целевого �ертификата: %s\n"
 
-#: dirmngr/ocsp.c:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "�тату� �ертификата: %s (�тот=%s, �ледующий=%s)\n"
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "хороший"
 
-#: dirmngr/ocsp.c:854
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "�ертификат был отозван %s по причине: %s\n"
 
-#: dirmngr/ocsp.c:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "ответчик OCSP возвратил �тату� в будущем\n"
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "ответчик OCSP возвратил нетекущий �тату�\n"
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "ответчик OCSP возвратил �лишком �тарый �тату�\n"
@@ -10956,63 +10963,63 @@ msgstr "�бой assuan_inquire(%s): %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "�бой assuan_inquire: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "ошибка отправки данных: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "�бой start_cert_fetch: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1776
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "�бой fetch_next_cert: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "превышено max_replies %d\n"
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "�бой при выделении пам�ти под управл�ющую �труктуру: %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "�бой размещени� контек�та Assuan: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "�бой инициализации �ервера: %s\n"
 
-#: dirmngr/server.c:3062
+#: dirmngr/server.c:3078
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "�бой реги�трации команд � помощью Assuan: %s\n"
 
-#: dirmngr/server.c:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "проблема � приемом Assuan: %s\n"
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "�бой обработки Assuan: %s\n"
@@ -11325,90 +11332,105 @@ msgstr ""
 "Синтак�и�: gpg-check-pattern [параметры] файл_образцов\n"
 "Проверить фразу-пароль, по�тупающую из stdin, по файлу образцов\n"
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: 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:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: tools/gpg-card.c:3758
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "authenticate to the card"
 msgstr "добавить �ертификат в буфер"
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "на�троить KDF дл� проверки по PIN"
 
-#: tools/gpg-card.c:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3707
+#: 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:3708
+#: 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:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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) нарушает "
diff --git a/po/sk.gmo b/po/sk.gmo
index a3dd7f2..93c90b9 100644
--- a/po/sk.gmo
+++ b/po/sk.gmo
diff --git a/po/sk.po b/po/sk.po
index 230dcbc..1670619 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -143,8 +143,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "nesprávne heslo"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
@@ -198,25 +198,25 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zmeniť heslo"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, 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:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -227,26 +227,26 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -257,39 +257,39 @@ msgstr "nemôžem otvoriť `%s': %s\n"
 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:2467
+#: agent/command-ssh.c:2472
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, 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:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, 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:3797
+#: agent/command-ssh.c:3837
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
@@ -420,208 +420,214 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "zmeniť heslo"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "s dodato�nými informáciami"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "byť o trochu tichší"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizovať databázu dôvery"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 #, 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:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "nepodporované"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "nepodporované"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "not supported"
+msgid "enable Win32-OpenSSH support"
+msgstr "nepodporované"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|použiť mód hesla N"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "použite gpg-agenta"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
@@ -631,149 +637,149 @@ msgstr ""
 "Chyby oznámte, prosím, na adresu <gnupg-bugs@gnu.org>.\n"
 "Pripomienky k prekladu <sk-i18n@lists.linux.sk>.\n"
 
-#: agent/gpg-agent.c:570
+#: agent/gpg-agent.c:582
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, 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:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, 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:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: nemôžem vytvoriť: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, 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:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "zapisujem tajný kľú� do `%s'\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, 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:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: adresár vytvorený\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, 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:2406
+#: agent/gpg-agent.c:2427
 #, 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:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2853
+#: agent/gpg-agent.c:2967
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, 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:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: presko�ené: %s\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1035,7 +1041,7 @@ msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 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:1602
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1053,52 +1059,52 @@ msgstr "ochranný algoritmus %d%s nie je podporováný\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1129,18 +1135,18 @@ msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpe�ne \"%s\"\n"
 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:884
+#: common/sysutils.c:881
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "ano"
 
@@ -1195,8 +1201,8 @@ msgstr ""
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1216,69 +1222,69 @@ msgstr "VAROV�N�: použitie parametra \"%s\" sa neodporú�a\n"
 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:432 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"
@@ -1446,12 +1452,12 @@ msgstr "Platnosť kľú�a vypršala!"
 msgid "Root certificate trustworthy"
 msgstr "nesprávny certifikát"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 #, fuzzy
 msgid "no CRL found for certificate"
 msgstr "nesprávny certifikát"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 #, fuzzy
 msgid "the available CRL is too old"
 msgstr "Kľú� k dispozícii na: "
@@ -1493,7 +1499,7 @@ msgstr "Pomoc nie je dostupná pre '%s'"
 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"
@@ -1538,36 +1544,36 @@ msgstr "nemožno otvoriť súbor: %s\n"
 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
 #, 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"
@@ -1577,92 +1583,92 @@ msgstr "zapisujem tajný kľú� do `%s'\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/armor.c:441
+#: 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"
@@ -1670,13 +1676,13 @@ msgstr ""
 "neplatný znak (quoted-printable) v ASCII kódovaní - pravdepodobne bol "
 "použitý nesprávny MTA\n"
 
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, 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:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1685,27 +1691,27 @@ msgstr ""
 "meno môže obsahovať len písmená, �íslice, bodky, pod�iarníky alebo medzery a "
 "kon�iť s '='\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "hodnota musí obsahovať znak '@'\n"
 
-#: g10/build-packet.c:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, fuzzy, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "hodnota musí obsahovať znak '@'\n"
 
-#: g10/build-packet.c:1612
+#: g10/build-packet.c:1630
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1715,7 +1721,7 @@ msgstr ""
 "meno môže obsahovať len písmená, �íslice, bodky, pod�iarníky alebo medzery a "
 "kon�iť s '='\n"
 
-#: g10/build-packet.c:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "VAROVANIE: nájdený neplatný formát zápisu dátumu\n"
@@ -1729,7 +1735,7 @@ msgstr ""
 msgid "Enter passphrase: "
 msgstr "Vložte heslo: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 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"
@@ -1747,7 +1753,7 @@ msgstr "chyba pri �ítaní `%s': %s\n"
 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:2330
+#: 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"
@@ -1792,177 +1798,177 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "vytvoriť revoka�ný certifikát"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:803 tools/gpg-card.c:1500
+#: g10/card-util.c:803 tools/gpg-card.c:1504
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:805 tools/gpg-card.c:1502
+#: g10/card-util.c:805 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:823 tools/gpg-card.c:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizovať predvoľby"
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 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:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vypísať fingerprint"
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 #, 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:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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 +1976,102 @@ msgid ""
 "      key types and sizes are supported.\n"
 msgstr ""
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 #, fuzzy
 msgid "Signature key\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 #, fuzzy
 msgid "Encryption key\n"
 msgstr "   (%d) RSA (len na Å¡ifrovanie)\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 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:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Neplatný výber.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2073,197 +2079,197 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 #, 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:1743 g10/card-util.c:1833
 #, 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:1744 g10/card-util.c:1835
 #, 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:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 #, 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:1876
 #, fuzzy, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "ukon�iť toto menu"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktné príkazy\n"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "ukázať túto pomoc"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 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:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3689
+#: g10/card-util.c:2262 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 #, fuzzy
 msgid "change the login name"
 msgstr "zmeniť dobu platnosti"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 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:3692
+#: g10/card-util.c:2265 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr ""
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vypísať fingerprint"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3696
+#: g10/card-util.c:2269 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:3697
+#: g10/card-util.c:2270 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3698
+#: g10/card-util.c:2271 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 #, 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:2276
 #, 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:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr ""
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktné príkazy\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktné príkazy\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 #, 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento príkaz nefunguje\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 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 +2331,9 @@ msgstr "key"
 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:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
@@ -2358,18 +2364,18 @@ 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:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, 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"
@@ -2379,47 +2385,48 @@ msgstr "nemôžete použiť šifrovací algoritmus \"%s\" v móde %s\n"
 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:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "použitá šifra %s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "`%s' je už skomprimovaný\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, 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:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, 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:862
+#: g10/encrypt.c:853
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "�ítam z `%s'\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, fuzzy, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2427,13 +2434,13 @@ msgid ""
 msgstr ""
 "vyžiadaný kompresný algoritmus %s (%d) nevyhovuje predvoľbám príjemcu\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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"
@@ -2464,69 +2471,80 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "VAROVANIE: ni� nebolo vyexportované\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2597,7 +2615,7 @@ msgstr ""
 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:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "neplatný parameter pre import\n"
@@ -2681,120 +2699,120 @@ msgstr "vytvoriť nový pár kľú�ov"
 msgid "quickly set a new expiration date"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "vytvoriť revoka�ný certifikát"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "odstrániť kľú� zo súboru verejných kľú�ov"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "odstrániť kľú� zo súboru tajných kľú�ov"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "podpísať kľú�"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "podpísať kľú� lokálne"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "podpísať kľú�"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "podpísať kľú� lokálne"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "podpísať alebo modifikovať kľú�"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zmeniť heslo"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "exportovať kľú�e"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "exportovať kľú�e na server kľú�ov"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "importovať kľú�e zo servera kľú�ov"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "vyhľadať kľú�e na serveri kľú�ov"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "aktualizovať všetky kľú�e zo servera kľú�ov"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "importovať/zlú�iť kľú�e"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "aktualizovať databázu dôvery"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [súbory]|vypíš hash"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|MENO|použi MENO ako implicitný tajný kľú�"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|MENO|šifrovať pre MENO"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
@@ -2810,58 +2828,58 @@ msgstr "nevykonať žiadne zmeny"
 msgid "prompt before overwriting"
 msgstr "vyžiadať potvrdenie pred prepísaním"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "vytvor výstup zakódovaný pomocou ASCII"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "použiť kánonický textový mód"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 #, 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:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 #, 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:781
+#: g10/gpg.c:780
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "skontrolovať podpisy kľú�ov"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
@@ -2891,7 +2909,7 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2900,7 +2918,7 @@ msgstr ""
 "(Použite manuálové stránky pre kompletný zoznam všetkých príkazov a "
 "možností)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2930,13 +2948,13 @@ msgstr ""
 " --list-keys [mená]        vypísať kľú�e\n"
 " --fingerprint [mená]      vypísať fingerprinty\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 #, 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:1175
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2951,7 +2969,7 @@ msgstr ""
 "podpísať, overiť, šifrovať alebo dešifrovať\n"
 "implicitné operácie závisia od vstupných dát\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2959,578 +2977,567 @@ msgstr ""
 "\n"
 "Podporované algoritmy:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Verejné kľú�e: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Å ifry: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "použitie: gpg [možnosti] "
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "konfliktné príkazy\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, 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:1708
+#: g10/gpg.c:1698
 #, 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:1711
+#: g10/gpg.c:1701
 #, 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:1714
+#: g10/gpg.c:1704
 #, 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:1720
+#: g10/gpg.c:1710
 #, 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:1723
+#: g10/gpg.c:1713
 #, 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:1726
+#: g10/gpg.c:1716
 #, 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:1732
+#: g10/gpg.c:1722
 #, 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:1735
+#: g10/gpg.c:1725
 #, 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:1738
+#: g10/gpg.c:1728
 #, 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:1744
+#: g10/gpg.c:1734
 #, 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:1747
+#: g10/gpg.c:1737
 #, 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:1750
+#: g10/gpg.c:1740
 #, 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:1966
+#: g10/gpg.c:1956
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "neznáma položka konfigurácie \"%s\"\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 #, 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:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 #, 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:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "ukáž v ktorom súbore kľú�ov je vypísaný kľú�"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 #, 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:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "set preference list"
+msgid "show preferences"
+msgstr "nastaviť zoznam predvolieb"
+
+#: g10/gpg.c:2197
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, 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:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Neplatná e-mailová adresa\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, 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:3355
+#: g10/gpg.c:3326
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatný parameter pre import\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatný parameter pre import\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemožno nastaviť exec-path na %s\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program môže vytvoriť súbor core!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prepíše %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolené používať %s s %s!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedáva s %s zmysel!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajný kľú� do `%s'\n"
 
-#: g10/gpg.c:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3952
-#, 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:3964
+#: g10/gpg.c:3927
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, 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:3987
+#: g10/gpg.c:3950
 #, 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:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "neplatné defaultné predvoľby\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatné užívateľské predvoľby pre šifrovanie\n"
 
-#: g10/gpg.c:4015
-#, 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:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "neplatné užívateľské predvoľby pre hashovanie\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "neplatné užívateľské predvoľby pre kompresiu\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, 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:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ešte nepracuje s %s\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "dešifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo poslať kľú� na server: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prijať kľú� zo servera: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export kľú�a: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, 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:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa nájsť server: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualizácia servera zlyhala: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite písať svoju správu ...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadané URL pre certifika�nú politiku je neplatné\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
@@ -3544,7 +3551,7 @@ msgstr "Zmazať tento kľú� zo súboru kľú�ov? "
 msgid "make timestamp conflicts only a warning"
 msgstr "konflikt �asového razítka"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 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,337 +3582,337 @@ msgstr "Pomoc nie je k dispozícii"
 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:1998 g10/import.c:3146
 #, 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:2004
 #, 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:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr ""
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, 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:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kľú� %08lX: tajný kľú� importovaný\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, 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:2801
 #, fuzzy, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
@@ -3918,204 +3925,204 @@ msgstr "chyba pri posielaní na `%s': %s\n"
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, 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:3138 g10/import.c:3177
 #, fuzzy, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "zapisujem tajný kľú� do `%s'\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "dôvod na revokáciu: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "revoka�ná poznámka: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, 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:3754
 #, 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:3769
 #, 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:3788
 #, 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:3812
 #, 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:3825
 #, 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:3840
 #, 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:3887
 #, 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:3914
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kľú� %08lX: podkľú� presko�ený\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, 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"
@@ -4153,7 +4160,7 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "Užívateľské ID \"%s\" je revokované."
 msgstr[1] "Užívateľské ID \"%s\" je revokované."
 
-#: g10/key-check.c:726 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 +4168,7 @@ msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr[0] "1 podpis neoverený, pretože chýba kľú�\n"
 msgstr[1] "1 podpis neoverený, pretože chýba kľú�\n"
 
-#: g10/key-check.c:734 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"
@@ -4215,15 +4222,15 @@ msgstr "chyba pri vytváraní `%s': %s\n"
 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:262
 msgid "[revocation]"
 msgstr "[revokácia]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[podpis kľú�a ním samým]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
@@ -4236,68 +4243,68 @@ msgstr ""
 "kontrolou fingerprintov z rôznych zdrojov...)?\n"
 "\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 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:390 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:408
 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:425
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  Nemožno podpísať.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Užívateľské ID \"%s\" je revokované."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, 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:646
 #, 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:648
 #, fuzzy
 msgid "Sign it? (y/N) "
 msgstr "Skuto�ne podpísať? "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4306,11 +4313,11 @@ msgstr ""
 "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:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4320,11 +4327,11 @@ msgstr ""
 "je len lokálny.\n"
 "\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4334,43 +4341,43 @@ msgstr ""
 "je len lokálny.\n"
 "\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "Platnosť kľú�a vypršala!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4380,32 +4387,32 @@ msgstr ""
 "patrí vyššie uvedenej osobe?\n"
 "Pokiaľ nepoznáte odpove�, zadajte \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Neodpoviem.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, 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:878
 #, 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:881
 #, 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:888
 #, fuzzy
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Váš výber? ('?' - viac informácií): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, fuzzy, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4414,28 +4421,28 @@ msgstr ""
 "Ste si istý, že chcete podpísať tento kľú�\n"
 "svojím kľú�om: \""
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 #, 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:928
 #, 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:935
 #, 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:945
 #, fuzzy
 msgid "The signature will be marked as non-exportable.\n"
 msgstr ""
@@ -4443,247 +4450,247 @@ msgstr ""
 "Podpis bude ozna�ený ako neexportovateľný.\n"
 "\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:952
 #, 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:959
 #, 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:964
 #, 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:969
 #, 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:981
 #, fuzzy
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podpísať? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "uložiť a ukon�iť"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vypísať fingerprint"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 #, fuzzy
 msgid "show the keygrip"
 msgstr "Podpisová notácia: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "vypísať zoznam kľú�ov a id užívateľov"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "vyberte identifikátor užívateľa N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 #, fuzzy
 msgid "select subkey N"
 msgstr "vyberte identifikátor užívateľa N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 #, fuzzy
 msgid "check signatures"
 msgstr "revokovať podpisy"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "podpísať kľú� lokálne"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 #, 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:1289
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "add a user ID"
 msgstr "pridať identifikátor užívateľa"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "pridať fotografické ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "zmazať identifikátor užívateľa"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "zmazať sekundárny kľú�"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "pridať revoka�ný kľú�"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 #, 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:1314
 #, 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:1316
 #, 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:1319
 msgid "list preferences (expert)"
 msgstr "vypísať zoznam predvolieb (pre expertov)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "vypísať zoznam predvolieb (podrobne)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 #, 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:1325
 #, 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:1327
 #, 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:1329
 msgid "change the passphrase"
 msgstr "zmeniť heslo"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "zmeniť dôveryhodnosť vlastníka kľú�a"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 #, 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:1337
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revokovať identifikátor užívateľa"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revokovať sekundárny kľú�"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 #, fuzzy
 msgid "enable key"
 msgstr "nastaviť kľú� ako platný (enable)"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 #, fuzzy
 msgid "disable key"
 msgstr "nastaviť kľú� ako neplatný (disable)"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "ukázať fotografické ID"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1349
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1470
 msgid "Secret key is available.\n"
 msgstr "Tajný kľú� je dostupný.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 #, 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:1574
 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:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4691,309 +4698,293 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "Kľú� revokovaný."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 #, 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:1682
 #, 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:1690
 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:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 #, 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:1756
 #, 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:1814 g10/keyedit.c:1854
 #, 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Musíte vybrať aspoň jeden kľú�.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, fuzzy, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "nemôžem otvoriť `%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, 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:1969
 msgid "You must select at least one key.\n"
 msgstr "Musíte vybrať aspoň jeden kľú�.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1975
 #, 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:1977
 #, 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:2015
 #, 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:2016
 #, 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:2034
 #, 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:2045
 #, 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:2047
 #, 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:2105
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2150
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "nastaviť zoznam predvolieb"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 #, 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:2159
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Skuto�ne aktualizovať predvoľby? "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Uložiť zmeny? "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�iť bez uloženia? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, 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:2557
+#: g10/keyedit.c:2558
 #, 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:2583
+#: g10/keyedit.c:2584
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: g10/keyedit.c:2677
+#: g10/keyedit.c:2717
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "chyba: neplatný odtla�ok\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "neplatná hodnota\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, 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:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Ni� na podpísanie kľú�om %08lX\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   podpísané %08lX v %s%s\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, 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:3211
+#: g10/keyedit.c:3251
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "chyba: neplatný odtla�ok\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "kľú� `%s' nebol nájdený: %s\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Digest: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Charakteristiky: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr ""
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 #, fuzzy
 msgid "Notations: "
 msgstr "Notácie: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citlivá informácia)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nemôžem vytvoriť: %s\n"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokované]"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnosť skon�í: %s]"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnosť skon�í: %s]"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " dôvera: %c/%c"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " dôvera: %c/%c"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Tento kľú� bol ozna�ený za neplatný (disabled)"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5001,19 +4992,19 @@ msgstr ""
 "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:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5022,18 +5013,18 @@ msgstr ""
 "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:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5042,35 +5033,35 @@ msgstr ""
 "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:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 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:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmazať tento dobrý podpis? (a/N/u)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmazať tento neplatný podpis? (a/N/u)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmazať tento neznámy podpis? (a/N/u)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmazať tento podpis podpísaný sebou samým? (a/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5078,38 +5069,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Zmazaný %d podpis.\n"
 msgstr[1] "Zmazaný %d podpis.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznané.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 #, fuzzy
 msgid "invalid"
 msgstr "neplatný spôsob reprezentácie v ASCII"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Užívateľské ID \"%s\" je revokované."
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Užívateľské ID \"%s\" je revokované."
 msgstr[1] "Užívateľské ID \"%s\" je revokované."
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5118,221 +5109,221 @@ msgstr ""
 "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:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vložte identifikátor užívateľa povereného revokáciou: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 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:4719
+#: g10/keyedit.c:4611
 #, 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:4788
+#: g10/keyedit.c:4680
 #, 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:4793
+#: g10/keyedit.c:4685
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Mením dobu platnosti sekundárneho kľú�a.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Mením dobu platnosti primárneho kľú�a.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Mením dobu platnosti sekundárneho kľú�a.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 #, 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:5033
+#: g10/keyedit.c:4925
 #, 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:5039
+#: g10/keyedit.c:4931
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosím, vyberte práve jedno id užívateľa.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, 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:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 #, 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:5451
+#: g10/keyedit.c:5345
 #, 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:5516
+#: g10/keyedit.c:5410
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podpisová notácia: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Prepísať (a/N)? "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, 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:5896
+#: g10/keyedit.c:5790
 #, 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:5918
+#: g10/keyedit.c:5812
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id užívateľa: \""
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (nexeportovateľné)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnosť podpisu vyprší %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 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:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvoriť pre tento podpis revoka�ný certifikát? (a/N)"
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovateľné)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokované %08lX v %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chystáte sa revokovať tieto podpisy:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvoriť revoka�né certifikáty? (a/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "neexistuje tajný kľú�\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, 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:6464
+#: g10/keyedit.c:6358
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5373,53 +5364,53 @@ msgstr "príliš veľa `%c' predvolieb\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "neplatný znak v reťazci s predvoľbami\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "zapisujem podpis kľú�a ním samým (direct signature)\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "zapisujem podpis kľú�a sebou samým\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "zapisujem \"key-binding\" podpis\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatná dĺžka kľú�a; použijem %u bitov\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dĺžka kľú�a zaokrúhlená na %u bitov\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr ""
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 #, fuzzy
 msgid "Sign"
 msgstr "sign"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr ""
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 #, fuzzy
 msgid "Encrypt"
 msgstr "šifrovať dáta"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr ""
 
@@ -5433,179 +5424,179 @@ msgstr ""
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr ""
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr ""
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr ""
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr ""
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, fuzzy, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%d) ElGamal (len na Å¡ifrovanie)\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, fuzzy, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) DSA a ElGamal (implicitný)\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA a ElGamal (implicitný)\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, 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:2136
+#: g10/keygen.c:2113
 #, 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:2142
+#: g10/keygen.c:2119
 #, fuzzy, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (len na Å¡ifrovanie)\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, 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:2150
+#: g10/keygen.c:2127
 #, fuzzy, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (len na Å¡ifrovanie)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (len na Å¡ifrovanie)\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) RSA (pro šifrování a podpis)\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 #, fuzzy
 #| msgid " (default)"
 msgid " *default*"
 msgstr "dešifrovať dáta (implicitne)"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, 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:2161
+#: g10/keygen.c:2138
 #, fuzzy, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (len na Å¡ifrovanie)\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, 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:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) RSA (len na Å¡ifrovanie)\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, fuzzy, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) RSA (len na Å¡ifrovanie)\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 #, fuzzy
 msgid "Enter the keygrip: "
 msgstr "Podpisová notácia: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 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:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 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:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 #, fuzzy
 msgid "Available keys:\n"
 msgstr "nastaviť kľú� ako neplatný (disable)"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, 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:2570
+#: g10/keygen.c:2547
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2555
 #, 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:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 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:2641
+#: g10/keygen.c:2618
 #, 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:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5621,7 +5612,7 @@ msgstr ""
 "      <n>m = doba platnosti kľú�a skon�í za n mesiacov\n"
 "      <n>y = doba platnosti kľú�a skon�í za n rokov\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5637,40 +5628,40 @@ msgstr ""
 "      <n>m = doba platnosti podpisu skon�í za n mesiacov\n"
 "      <n>y = doba platnosti podpisu skon�í za n rokov\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Kľú� je platný na? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platný na? (0) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "neplatná hodnota\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "platnosť %s neskon�í\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "platnosť %s neskon�í\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "platnosť %s skon�í %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnosť podpisu vyprší %s\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5678,12 +5669,12 @@ msgstr ""
 "Váš systém nevie zobraziť dátumy po roku 2038.\n"
 "V každom prípade budú dátumy korektne spracovávané do roku 2106.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Je to správne (a/n)? "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5694,7 +5685,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 #, fuzzy
 msgid ""
 "\n"
@@ -5711,42 +5702,42 @@ msgstr ""
 "    \"Jozko Mrkvicka (student) <jozko@mrkvicka.sk>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Meno a priezvisko: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Neplatný znak ve mene\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "E-mailová adresa: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Neplatná e-mailová adresa\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Komentár: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Neplatný znak v komentári\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, 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:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5757,11 +5748,11 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr ""
 
@@ -5776,35 +5767,35 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "mMkKeEPpUu"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 #, 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:3148
+#: g10/keygen.c:3125
 #, 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Najskôr, prosím, opravte chybu\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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 +5807,18 @@ msgstr ""
 "používať disky); v�aka tomu má generátor lepšiu šancu získať dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie kľú�a sa nepodarilo: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5835,67 +5826,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, fuzzy, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "`%s' je už skomprimovaný\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 #, fuzzy
 msgid "Create anyway? (y/N) "
 msgstr "Použiť napriek tomu tento kľú�? "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, fuzzy, c-format
 msgid "creating anyway\n"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Vytváranie kľú�a bolo zrušené.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, fuzzy, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "nemôžem vytvoriť `%s': %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, 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:5599
+#: g10/keygen.c:5570
 #, 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:5613
+#: g10/keygen.c:5584
 #, 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:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "verejný a tajný kľú� boli vytvorené a podpísané.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -5904,7 +5895,7 @@ msgstr ""
 "Tento kľú� nemôže byť použitý na šifrovanie. Pre vytvorenie\n"
 "sekundárneho kľú�a na tento ú�el môžete použiť príkaz \"--edit-key\".\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5912,7 +5903,7 @@ msgstr ""
 "kľú� bol vytvorený %lu sekund v budúcnosti (došlo k zmene �asu alebo\n"
 "je problém so systémovým �asom)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5920,23 +5911,23 @@ msgstr ""
 "kľú� bol vytvorený %lu sekund v budúcnosti (došlo k zmene �asu alebo\n"
 "je problém so systémovým �asom)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skuto�ne vytvoriť? "
@@ -5945,27 +5936,43 @@ msgstr "Skuto�ne vytvoriť? "
 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 +5980,7 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d zlých podpisov\n"
 msgstr[1] "%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 +5988,41 @@ msgid_plural "%d signatures not checked due to errors\n"
 msgstr[0] "1 podpis neoverený, pretože vznikla chyba\n"
 msgstr[1] "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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "súbor kľú�ov (keyring)"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Primárny fingerprint kľú�a:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr " Primárny fingerprint kľú�a:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "      Fingerprint podkľú�a:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 #, fuzzy
 msgid "      Key fingerprint ="
 msgstr "   Fingerprint kľú�a ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr ""
 
@@ -6398,7 +6405,7 @@ msgstr "binárne"
 msgid "textmode"
 msgstr "textový mód"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "neznáme"
 
@@ -6539,27 +6546,27 @@ msgstr "Nekomprimované"
 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:1614
 #, fuzzy, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "�ítam možnosti z `%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, fuzzy, c-format
 msgid "unknown option '%s'\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, fuzzy, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "neznáma trieda podpisu"
@@ -6681,7 +6688,7 @@ msgid ""
 "%s"
 msgstr "dĺžka %u bitov, typ %s, ID %08lX, vytvorený %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6696,73 +6703,73 @@ msgstr ""
 "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:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Meno súbor s fotografiou vo formáte JPEG: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, 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:239
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr ""
 
-#: g10/photoid.c:134
+#: g10/photoid.c:241
 #, 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:257
 #, 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:276
 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:421
 #, 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:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "nekorektné ukon�enie externého programu\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6770,7 +6777,7 @@ msgstr ""
 "volanie externého programu zrušené kvôli nebezpe�ným právam súboru "
 "nastavení\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, fuzzy, c-format
 msgid "unable to display photo ID!\n"
 msgstr "nemožno nastaviť exec-path na %s\n"
@@ -7101,12 +7108,12 @@ msgstr "neznámy implicitný adresát `%s'\n"
 msgid "no valid addressees\n"
 msgstr "žiadne platné adresy\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, 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:1768
+#: g10/pkclist.c:1766
 #, fuzzy, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "kľú� %08lX: chyba identifikátor užívateľa\n"
@@ -8166,7 +8173,7 @@ msgstr ""
 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"
@@ -8196,14 +8203,14 @@ msgstr "prosím vykonajte --check-trustdb\n"
 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"
 msgstr[0] "%lu kľú�e boli doteraz spracované\n"
 msgstr[1] "%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"
@@ -8211,23 +8218,23 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d kľú�ov spracovaných (%d po�tov platnosti vymazaných)\n"
 msgstr[1] "%d kľú�ov spracovaných (%d po�tov platnosti vymazaných)\n"
 
-#: g10/trustdb.c: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"
@@ -8356,7 +8363,7 @@ msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8364,7 +8371,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8400,7 +8407,7 @@ msgstr "zmeniť heslo"
 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:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8486,75 +8493,75 @@ msgstr[1] "Vytvorenie kľú�a sa nepodarilo: %s\n"
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "zmeniť heslo"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 scd/app-nks.c:2089
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "zmeniť heslo"
 
-#: scd/app-nks.c:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1654
+#: 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:1701
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2074
+#: scd/app-nks.c:2088
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "zmeniť heslo"
 
-#: scd/app-nks.c:2082
+#: 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:2092
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2102
+#: 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:2104
+#: 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:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
@@ -8819,13 +8826,13 @@ msgstr ""
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8834,11 +8841,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr ""
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:199 sm/certchain.c:2211
 msgid "chain"
 msgstr ""
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 #, fuzzy
 msgid "shell"
 msgstr "help"
@@ -8862,241 +8869,241 @@ msgstr ""
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, 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:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr ""
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr ""
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr ""
 
-#: sm/certchain.c:817
+#: sm/certchain.c:818
 #, 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:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, 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:1260 sm/certchain.c:1264
 #, fuzzy
 msgid "certificate has been revoked"
 msgstr "POZN�MKA: kľú� bol revokovaný"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr ""
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr ""
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr ""
 
-#: sm/certchain.c:1305 sm/certchain.c:1390 dirmngr/validate.c:516
+#: sm/certchain.c:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 #, 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:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr ""
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, fuzzy, c-format
 msgid "certificate has expired"
 msgstr "Platnosť kľú�a vypršala!"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 #, fuzzy
 msgid "root certificate has expired"
 msgstr "Platnosť kľú�a vypršala!"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 #, fuzzy
 msgid "intermediate certificate has expired"
 msgstr "Platnosť kľú�a vypršala!"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr ""
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1404
 #, fuzzy
 msgid "certificate with invalid validity"
 msgstr "Platnosť kľú�a vypršala!"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr ""
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr ""
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, fuzzy, c-format
 msgid "  (  signature created at "
 msgstr "               nové podpisy: %lu\n"
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, fuzzy, c-format
 msgid "  (certificate created at "
 msgstr "Revoka�ný certifikát bol vytvorený.\n"
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, fuzzy, c-format
 msgid "  (certificate valid from "
 msgstr "nesprávny certifikát"
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr ""
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, fuzzy, c-format
 msgid "fingerprint=%s\n"
 msgstr "vypísať fingerprint"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr ""
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1505
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr ""
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1511
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr ""
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 #, fuzzy
 msgid "no issuer found in certificate"
 msgstr "vytvoriť revoka�ný certifikát"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 msgid "self-signed certificate has a BAD signature"
 msgstr ""
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr ""
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr ""
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, fuzzy, c-format
 msgid "certificate has a BAD signature"
 msgstr "verifikovať podpis"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1911 dirmngr/validate.c:693
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, fuzzy, c-format
 msgid "certificate is good\n"
 msgstr "duplicita predvoľby %c%lu\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, fuzzy, c-format
 msgid "intermediate certificate is good\n"
 msgstr "Revoka�ný certifikát bol vytvorený.\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, fuzzy, c-format
 msgid "root certificate is good\n"
 msgstr "nesprávny certifikát"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr ""
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr ""
@@ -9119,7 +9126,7 @@ msgstr "nespracované"
 msgid "(this is the MD2 algorithm)\n"
 msgstr ""
 
-#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 #, fuzzy
 msgid "none"
 msgstr "nie"
@@ -9155,42 +9162,42 @@ msgstr ""
 "\"%.*s\"\n"
 "kľú� s dĺžkou %u bitov, typ %s, ID %08lX, vytvorený %s%s\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "nesprávny certifikát"
@@ -9754,7 +9761,7 @@ 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:916
 #, fuzzy, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "Podpis vytvorený %.*s pomocou %s kľú�a ID %08lX\n"
@@ -9948,7 +9955,7 @@ msgstr "zmazanie bloku kľú�a sa nepodarilo:  %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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, fuzzy, c-format
 msgid "error closing cache file: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
@@ -10198,201 +10205,201 @@ msgstr "neplatný hashovací algoritmus `%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1849 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:1923
 #, 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:1938
 #, 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:1945
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, 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:1984
 #, 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:2011
 #, 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:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, 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:2084
 #, 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:2226
 #, 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:2233
 #, fuzzy, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, 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:2301
 #, fuzzy, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "zapisujem do '%s'\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2308
 #, 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:2333
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, fuzzy, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2414
 #, fuzzy, c-format
 msgid "creating cache file '%s'\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, 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:2460
 #, 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:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 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:2523
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, 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:2558
 #, 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:2569
 #, 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:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, fuzzy, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, fuzzy, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, fuzzy, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
@@ -10757,12 +10764,12 @@ msgstr "použitie: gpg [možnosti] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "Nie je dovolené používať %s s %s!\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
@@ -11010,93 +11017,93 @@ msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:582
+#: 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:598 dirmngr/ocsp.c:782
+#: 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:642
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, fuzzy, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "kľú� `%s' nebol nájdený: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:698
+#: 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:708
+#: 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:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:753
+#: 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:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:765
+#: 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:822
+#: 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:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11110,64 +11117,64 @@ msgstr "podpisovanie zlyhalo: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, fuzzy, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, fuzzy, c-format
 msgid "error sending data: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, 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:1776
 #, 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:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, fuzzy, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "nemôžem vytvoriť `%s': %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, fuzzy, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, 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:3062
+#: dirmngr/server.c:3078
 #, 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:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -11486,87 +11493,101 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr ""
 
-#: tools/gpg-card.c:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: tools/gpg-card.c:3758
 #, fuzzy
 msgid "authenticate to the card"
 msgstr "Revoka�ný certifikát bol vytvorený.\n"
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: 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:3706
+#: 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:3707
+#: 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:3708
+#: 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:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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"
 
@@ -13185,9 +13206,6 @@ msgstr ""
 #~ msgid "delete signatures"
 #~ msgstr "zmazať podpisy"
 
-#~ msgid "set preference list"
-#~ msgstr "nastaviť zoznam predvolieb"
-
 #~ msgid "updated preferences"
 #~ msgstr "aktualizovať predvoľby"
 
diff --git a/po/sv.gmo b/po/sv.gmo
index 31bbda7..7436f4b 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index ca21e7e..de7cef1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg trunk\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2017-11-02 17:41+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -180,8 +180,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "Lösenfras:"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "stämmer inte överens - försök igen"
 
@@ -231,17 +231,17 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, 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:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Ange denna lösenfras igen"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -252,7 +252,7 @@ msgid ""
 msgstr ""
 "Ange lösenfrasen för att skydda det importerade objektet inom GnuPG-systemet."
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -265,26 +265,26 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -295,33 +295,33 @@ msgstr "kan inte öppna \"%s\": %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "ingen lämplig kortnyckel hittades: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, 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:2777
+#: agent/command-ssh.c:2782
 #, 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:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -330,7 +330,7 @@ msgstr ""
 "Ange en lösenfras för att skydda den mottagna hemliga nyckeln%%0A   %s%%0Ai  "
 "gpg-agents nyckellager"
 
-#: agent/command-ssh.c:3797
+#: agent/command-ssh.c:3837
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "misslyckades med att skapa flöde från uttag: %s\n"
@@ -481,213 +481,219 @@ msgstr "Ange lösenfrasen för%0Aför att skydda din nya nyckel"
 msgid "Please enter the new passphrase"
 msgstr "Ange den nya lösenfrasen"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Flaggor användbara för felsökning"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr "kör i demonläge (bakgrund)"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "frigör inte från konsollen"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr "sh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr "csh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr "Flaggor som kontrollerar diagnosutdata"
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "utförlig"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FIL|skriv serverlägesloggar till FIL"
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr "Flaggor som kontrollerar konfigurationen"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 msgid "do not use the SCdaemon"
 msgstr "använd inte SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PRG|använd PRG som SCdaemon-programmet"
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 #, 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:215
+#: agent/gpg-agent.c:216
 #, 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:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr "ignorera begäran om att ändra TTY"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr "ignorera begäran om att ändra X-display"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 #, fuzzy
 #| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "aktivera ssh-agent-emulering"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 msgid "enable putty support"
 msgstr ""
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "enable ssh-agent emulation"
+msgid "enable Win32-OpenSSH support"
+msgstr "aktivera ssh-agent-emulering"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "Flaggor som kontrollerar säkerheten"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|låt mellanlagrade PIN-koder gå ut efter N sekunder"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|låt mellanlagrade SSH-nycklar gå ut efter N sekunder"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 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:248
+#: agent/gpg-agent.c:256
 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:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr "använd inte mellanlagring av PIN-kod vid signering"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 #, 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:254
+#: agent/gpg-agent.c:262
 #, 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:259
+#: agent/gpg-agent.c:267
 msgid "allow presetting passphrase"
 msgstr "tillåt förinställning av lösenfras"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr "Flaggor som tvingar igenom en lösenfraspolicy"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr "tillåt inte att gå förbi lösenfraspolicyn"
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 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:271
+#: agent/gpg-agent.c:279
 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:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FIL|kontrollera nya lösenfraser mot mönster i FIL"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|låt mellanlagrad lösenfras gå ut efter N dagar"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 msgid "do not allow the reuse of old passphrases"
 msgstr "tillåt inte återanvändning av gamla lösenfraser"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Flaggor som kontrollerar säkerheten"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 #, 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:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 #, 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:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
@@ -696,13 +702,13 @@ msgstr ""
 "Rapportera fel till <@EMAIL@>.\n"
 "Skicka synpunkter på översättningen till <tp-sv@listor.tp-sv.se>.\n"
 
-#: agent/gpg-agent.c:570
+#: agent/gpg-agent.c:582
 #, 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:572
+#: agent/gpg-agent.c:584
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -714,149 +720,149 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, 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:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, 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:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, 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:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, 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:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, 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:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, 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:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, 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:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, 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:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: 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:2402
+#: agent/gpg-agent.c:2423
 #, 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:2406
+#: agent/gpg-agent.c:2427
 #, 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:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, 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:2768
+#: agent/gpg-agent.c:2882
 #, 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:2773
+#: agent/gpg-agent.c:2887
 #, 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:2848
+#: agent/gpg-agent.c:2962
 #, 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:2853
+#: agent/gpg-agent.c:2967
 #, 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:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, 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:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppad\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1138,7 +1144,7 @@ msgstr "kontroll av den skapade signaturen misslyckades: %s\n"
 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:1602
 #, fuzzy, c-format
 #| msgid "protection algorithm %d%s is not supported\n"
 msgid "public key algorithm %d (%s) is not supported\n"
@@ -1156,13 +1162,13 @@ msgstr "skyddsalgoritmen %d%s stöds inte\n"
 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
@@ -1170,43 +1176,43 @@ msgstr "fel när ett rör skapades: %s\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1238,20 +1244,20 @@ msgstr "Varning: osäkert ägarskap på %s \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Varning: osäkra rättigheter på %s \"%s\"\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, fuzzy, c-format
 #| msgid "waiting %d seconds for the agent to come up\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "väntar %d sekunder för att agenten ska komma igång\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "ja"
 
@@ -1305,8 +1311,8 @@ msgstr "slut på kärna i säkert minne vid allokering av %lu byte"
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1327,77 +1333,77 @@ msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
 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:432 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"
@@ -1546,11 +1552,11 @@ msgstr "Certifikatkedjan är giltig"
 msgid "Root certificate trustworthy"
 msgstr "rotcertifikatet är pålitligt"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 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:1115 sm/certchain.c:1284
 msgid "the available CRL is too old"
 msgstr "den tillgängliga spärrlistan är för gammal"
 
@@ -1588,7 +1594,7 @@ msgstr "Det finns ingen hjälp tillgänglig för \"%s\"."
 msgid "ignoring garbage line"
 msgstr "ignorerar skräprad"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "[none]"
 msgstr "[ingen]"
 
@@ -1635,39 +1641,39 @@ msgstr "iconv_open misslyckades: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "konvertering från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: 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
 #, 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"
@@ -1677,95 +1683,95 @@ msgstr "väntar på låset %s...\n"
 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
+#: 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"
@@ -1775,13 +1781,13 @@ msgstr ""
 "beror sannolikt på att en felaktig e-postserver eller e-postklient har "
 "använts\n"
 
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "inte läsbart"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1790,28 +1796,28 @@ msgstr ""
 "ett notationsnamn får endast innehålla skrivbara tecken eller blanksteg, och "
 "sluta med ett \"'=\"\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, 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:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, 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:1550
+#: g10/build-packet.c:1568
 #, 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:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1821,7 +1827,7 @@ msgstr ""
 "ett notationsnamn får endast innehålla skrivbara tecken eller blanksteg, och "
 "sluta med ett \"'=\"\n"
 
-#: g10/build-packet.c:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "VARNING: ogiltig notationsdata hittades\n"
@@ -1837,7 +1843,7 @@ msgstr "misslyckades med att förmedla %s-begäran till klient\n"
 msgid "Enter passphrase: "
 msgstr "Ange lösenfrasen\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 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"
@@ -1856,7 +1862,7 @@ msgstr "fel vid läsning från %s: %s\n"
 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:2330
+#: 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"
@@ -1902,172 +1908,172 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: 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:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "tvingad"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 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:1500
+#: g10/card-util.c:803 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:1502
+#: g10/card-util.c:805 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:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Kortinnehavarens efternamn: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Kortinnehavarens förnamn: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Inloggningsdata (kontonamn): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Språkinställningar: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Fel: ogiltigt svar.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtryck: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 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:1296
 #, 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:1297
 msgid "not an OpenPGP card"
 msgstr "inte ett OpenPGP-kort"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr "Ersätt existerande nyckel? (j/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 tools/gpg-card.c:3363
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -2084,73 +2090,73 @@ msgstr ""
 "      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:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) Signeringsnyckel\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) Krypteringsnyckel\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) Autentiseringsnyckel\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Ogiltigt val.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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"
@@ -2158,41 +2164,41 @@ msgstr ""
 "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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, 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:2429
+#: g10/card-util.c:1694 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:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, fuzzy, c-format
 #| msgid ""
 #| "Please note that the factory settings of the PINs are\n"
@@ -2207,196 +2213,196 @@ msgstr ""
 "   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:1741
 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:1743 g10/card-util.c:1833
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signeringsnyckel\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1744 g10/card-util.c:1835
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnyckel\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsnyckel\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 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:1876
 #, 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:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr "visa administratörskommandon"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 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:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "ändra kortinnehavarens namn"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 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:3689
+#: g10/card-util.c:2262 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:3690
+#: g10/card-util.c:2263 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:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "ändra språkinställningarna"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 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:3694
+#: g10/card-util.c:2267 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:3695
+#: g10/card-util.c:2268 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:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "generera nya nycklar"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 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:3698
+#: g10/card-util.c:2271 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:3699
+#: g10/card-util.c:2272 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:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 #, 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:2276
 #, 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:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/kort> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 msgid "Admin-only command\n"
 msgstr "Kommandon endast för administratör\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr "Administrationskommandon tillåts\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, 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:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2458,9 +2464,9 @@ msgstr ""
 msgid "subkey"
 msgstr "Publik nyckel: "
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
@@ -2493,19 +2499,19 @@ msgstr ""
 "VARNING: tvinga symmetriskt chiffer med %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, 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"
@@ -2517,35 +2523,36 @@ msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\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:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "fel när lösenfras skapades: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "använder %s-chiffer\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, fuzzy, c-format
 #| msgid "`%s' already compressed\n"
 msgid "'%s' already compressed\n"
 msgstr "\"%s\" är redan komprimerad\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, 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:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, fuzzy, c-format
 #| msgid "you may not use digest algorithm `%s' while in %s mode\n"
@@ -2553,13 +2560,13 @@ 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:862
+#: g10/encrypt.c:853
 #, fuzzy, c-format
 #| msgid "reading from `%s'\n"
 msgid "reading from '%s'\n"
 msgstr "läser från \"%s\"\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2568,13 +2575,13 @@ msgstr ""
 "VARNING: tvinga komprimeringsalgoritmen %s (%d) strider mot "
 "mottagarinställningarna\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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"
@@ -2605,64 +2612,76 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: ingenting exporterat\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2733,7 +2752,7 @@ msgstr ""
 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:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
@@ -2816,117 +2835,117 @@ msgstr "generera ett nytt nyckelpar"
 msgid "quickly set a new expiration date"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den publika nyckelringen"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "ändra en lösenfras"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "importera/slå samman nycklar"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr "skriv ut kortstatus"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr "ändra data på ett kort"
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr "ändra PIN-kod för ett kort"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 msgid "print message digests"
 msgstr "skriv ut kontrollsummor"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "kör i serverläge"
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAMN|kryptera även till användaridentiteten NAMN"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|ange e-postalias (ett eller flera)"
 
@@ -2942,61 +2961,61 @@ msgstr "gör inga ändringar"
 msgid "prompt before overwriting"
 msgstr "fråga innan överskrivning"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Flaggor som kontrollerar säkerheten"
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Flaggor som kontrollerar diagnosutdata"
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FIL|skriv utdata till FIL"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 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:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 #, 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:773
+#: g10/gpg.c:772
 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:776
+#: g10/gpg.c:775
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "inaktivera all åtkomst till dirmngr"
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -3026,7 +3045,7 @@ msgstr ""
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -3034,7 +3053,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -3064,14 +3083,14 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 #, 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:1175
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -3086,7 +3105,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -3094,85 +3113,85 @@ msgstr ""
 "\n"
 "Algoritmer som stöds:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Publik nyckel: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] %s\n"
 msgstr "användning: gpgsm [flaggor] "
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, 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:1708
+#: g10/gpg.c:1698
 #, 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:1711
+#: g10/gpg.c:1701
 #, 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:1714
+#: g10/gpg.c:1704
 #, 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:1720
+#: g10/gpg.c:1710
 #, 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:1723
+#: g10/gpg.c:1713
 #, 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:1726
+#: g10/gpg.c:1716
 #, 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:1732
+#: g10/gpg.c:1722
 #, 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:1735
+#: g10/gpg.c:1725
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3182,21 +3201,21 @@ msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1738
+#: g10/gpg.c:1728
 #, 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:1744
+#: g10/gpg.c:1734
 #, 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:1747
+#: g10/gpg.c:1737
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3207,505 +3226,492 @@ msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1750
+#: g10/gpg.c:1740
 #, 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:1966
+#: g10/gpg.c:1956
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id under nyckellistning"
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 #, 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:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er under signaturlistningar"
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer under signaturlistningar"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer under signaturlistningar"
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer under signaturlistningar"
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum under signaturlistningar"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "lista inställningar (expertläge)"
+
+#: g10/gpg.c:2197
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "okänd flagga \"%s\"\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, 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:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, 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:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, 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:3220
+#: g10/gpg.c:3194
 #, 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:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, 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:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, 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:3315
+#: g10/gpg.c:3286
 #, 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:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id under signaturvalidering"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er under signaturvalidering"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer under signaturvalidering"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer under signaturvalidering"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer under signaturvalidering"
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 msgid "show only the primary user ID in signature verification"
 msgstr "visa endast primär användaridentitet i signaturvalidering"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, 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:3648
+#: g10/gpg.c:3621
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, 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:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, 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:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "VARNING: kör med falsk systemtid: "
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, 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:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3952
-#, 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:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, 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:3985
+#: g10/gpg.c:3948
 #, 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:3987
+#: g10/gpg.c:3950
 #, 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:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, 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:4001
+#: g10/gpg.c:3964
 #, 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:4008
+#: g10/gpg.c:3971
 #, 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:4012
+#: g10/gpg.c:3975
 #, 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:4015
-#, 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:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, 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:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, 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:4388
+#: g10/gpg.c:4336
 #, 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:4417
+#: g10/gpg.c:4365
 #, 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:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, 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:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, 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:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
@@ -3721,7 +3727,7 @@ msgstr "|FIL|ta nycklarna från nyckelringen FIL "
 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:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
@@ -3751,164 +3757,164 @@ msgstr "Det finns ingen hjälp tillgänglig"
 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"
@@ -3917,181 +3923,181 @@ msgstr ""
 "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:1998 g10/import.c:3146
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "nyckel %s: ingen användaridentitet\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, 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:2005 g10/import.c:3118
 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:2054
 #, 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:2075
 #, 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:2086 g10/import.c:2117
 #, 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:2088
 #, 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:2167 g10/import.c:3533
 #, 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:2173
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nyckel %s: ny nyckel - hoppade över\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, 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:2240
 #, 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:2267
 #, 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:2335
 #, 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:2338
 #, 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:2341
 #, 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:2344
 #, 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:2347
 #, 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:2350
 #, 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:2353
 #, 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:2356
 #, 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:2359
 #, 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:2362
 #, 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:2398
 #, 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:2785 g10/import.c:2980
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nyckel %s: hemlig nyckel importerades\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, 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:2801
 #, fuzzy, c-format
 #| msgid "error sending %s command: %s\n"
 msgid "key %s: error sending to agent: %s\n"
@@ -4105,208 +4111,208 @@ msgstr "fel vid sändning av %s-kommando: %s\n"
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, 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:3138 g10/import.c:3177
 #, 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:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "anledning för spärrning: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "spärrningskommentar: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, 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:3555
 #, 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:3562
 #, 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:3582
 #, 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:3617
 #, 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:3703
 #, 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:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, 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:3740
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "nyckel %s: ogiltig direkt nyckelsignatur\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3754
 #, 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:3769
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nyckel %s: ogiltig undernyckelbindning\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3788
 #, 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:3812
 #, 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:3825
 #, 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:3840
 #, 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:3887
 #, 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:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nyckel %s: hoppade över undernyckel\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, 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:3985
 #, 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:4009
 #, 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:4017
 #, 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:4190
 #, 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:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, 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:4482
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
@@ -4350,7 +4356,7 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "Användaridentitet \"%s\": %d signaturer borttagna\n"
 msgstr[1] "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
-#: g10/key-check.c:726 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"
@@ -4358,7 +4364,7 @@ msgid_plural "%d signatures not checked due to missing keys\n"
 msgstr[0] "1 signatur validerades inte eftersom nyckeln saknades\n"
 msgstr[1] "1 signatur validerades inte eftersom nyckeln saknades\n"
 
-#: g10/key-check.c:734 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"
@@ -4416,15 +4422,15 @@ msgstr "nyckelblockresurs \"%s\": %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[revocation]"
 msgstr "[spärr]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[självsignatur]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4435,17 +4441,17 @@ msgstr ""
 "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:389 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:390 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:408
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4455,51 +4461,51 @@ msgstr ""
 "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:425
 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:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, 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:617
 #, 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:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Användaridentiteten \"%s\" är signerbar.  "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr "Signera den? (j/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4508,11 +4514,11 @@ msgstr ""
 "Självsignaturen på \"%s\"\n"
 "är en signatur av PGP 2.x-typ.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4521,13 +4527,13 @@ msgstr ""
 "Giltighetstiden för din nuvarande signatur på \"%s\"\n"
 "har gått ut.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4536,44 +4542,44 @@ msgstr ""
 "Din nuvarande signatur på \"%s\"\n"
 "är en lokal signatur.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 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:748
 #, 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:752
 #, 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:758
 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:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "Giltighetstiden för denna nyckel har gått ut!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, 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:828
 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:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4582,33 +4588,33 @@ msgstr ""
 "Hur noga har du kontrollerat att nyckeln du ska signera verkligen tillhör\n"
 "personen som nämns ovan?  Om du inte vet vad du ska svara, svara \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, 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:876
 #, 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:878
 #, 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:881
 #, 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:888
 #, 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:915
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4617,240 +4623,240 @@ msgstr ""
 "Ä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:923
 msgid "This will be a self-signature.\n"
 msgstr "Detta kommer att bli en självsignatur.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 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:935
 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:945
 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:952
 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:959
 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:964
 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:969
 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:981
 msgid "Really sign? (y/N) "
 msgstr "Verkligen signera? (j/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 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:1152
 #, 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:1266
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 msgid "show key fingerprint"
 msgstr "visa nyckelns fingeravtryck"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 #, fuzzy
 #| msgid "Enter the keygrip: "
 msgid "show the keygrip"
 msgstr "Ange nyckelhashen: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "lista nycklar och användaridentiteter"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "välj användaridentiteten N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr "välj undernyckel N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr "kontrollera signaturer"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 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:1286
 msgid "sign selected user IDs locally"
 msgstr "signera valda användaridentiteter lokalt"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 msgid "sign selected user IDs with a trust signature"
 msgstr "signera valda användaridentiteter med en tillitssignatur"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 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:1291
 msgid "add a user ID"
 msgstr "lägg till en användaridentitet"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "lägg till ett foto-id"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr "ta bort valda användaridentiteter"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr "lägg till en undernyckel"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr "lägg till en nyckel till ett smartkort"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr "flytta en nyckel till ett smartkort"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr "flytta en nyckelkopia till ett smartkort"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 msgid "delete selected subkeys"
 msgstr "ta bort valda undernycklar"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "lägg till en spärrnyckel"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 msgid "delete signatures from the selected user IDs"
 msgstr "ta bort signaturer från valda användaridentiteter"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1314
 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:1316
 msgid "flag the selected user ID as primary"
 msgstr "flagga vald användaridentitet som primär"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "lista inställningar (expertläge)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "lista inställningar (utförligt)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 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:1325
 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:1327
 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:1329
 msgid "change the passphrase"
 msgstr "ändra lösenfrasen"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 msgid "revoke signatures on the selected user IDs"
 msgstr "spärra signaturer på valda användaridentiteter"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 msgid "revoke selected user IDs"
 msgstr "spärra valda användaridentiteter"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "revoke key or selected subkeys"
 msgstr "spärra nyckel eller valda undernycklar"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "enable key"
 msgstr "aktivera nyckel"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr "inaktivera nyckel"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr "visa valda foto-id:n"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 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:1349
 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:1470
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 #, 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:1574
 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:1597
 #, fuzzy
 #| msgid ""
 #| "* The `sign' command may be prefixed with an `l' for local signatures "
@@ -4870,308 +4876,292 @@ msgstr ""
 "signaturer\n"
 "  (nrsign), eller en kombination av dessa (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "Nyckeln är spärrad."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 #, 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:1682
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Verkligen signera alla användaridentiteter? (j/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1690
 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:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 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:1756
 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:1814 g10/keyedit.c:1854
 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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 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:1894
 msgid "Command expects a filename argument\n"
 msgstr "Kommandot förväntar ett filnamnsargument\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, 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:1934
 #, 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:1969
 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:1975
 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:1977
 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:2015
 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:2016
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Verkligen spärra denna användaridentitet? (j/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2034
 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:2045
 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:2047
 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:2105
 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:2150
 msgid "Set preference list to:\n"
 msgstr "Ställ in inställningslista till:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 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:2159
 msgid "Really update the preferences? (y/N) "
 msgstr "Vill du verkligen uppdatera inställningarna? (j/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Save changes? (y/N) "
 msgstr "Spara ändringar? (j/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? (j/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, 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:2557
+#: g10/keyedit.c:2558
 #, 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:2583
+#: g10/keyedit.c:2584
 #, 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:2646
+#: g10/keyedit.c:2647
 #, 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:2677
+#: g10/keyedit.c:2717
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "ogiltigt fingeravtryck"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, 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:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "ogiltigt värde\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Ingen sådan användaridentitet.\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 #, 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:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Inte signerad av dig.\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, 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:3211
+#: g10/keyedit.c:3251
 #, 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:3253
+#: g10/keyedit.c:3293
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "ogiltigt fingeravtryck"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, 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:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Sammandrag: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Funktioner: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr "Nyckelserver no-modify"
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Föredragen nyckelserver: "
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, 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:3867
+#: g10/keyedit.c:3759
 #, 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:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr "(känsligt)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "skapat: %s"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr "spärrad: %s"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr "utgånget: %s"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "går ut: %s"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr "kortnummer: "
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr "giltighet: %s"
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5179,17 +5169,17 @@ msgstr ""
 "Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
 "såvida inte du startar om programmet.\n"
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "utgånget"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5199,18 +5189,18 @@ msgstr ""
 "Detta kommando kan göra att en annan användaridentitet antas\n"
 "vara den primära identiteten.\n"
 
-#: g10/keyedit.c:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, 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:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5219,38 +5209,38 @@ msgstr ""
 "VARNING: Detta är en nyckel av PGP2-typ.  Om du lägger till ett foto-id kan\n"
 "         vissa versioner av PGP avvisa denna nyckel.\n"
 
-#: g10/keyedit.c:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 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:4324
+#: g10/keyedit.c:4216
 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:4339
+#: g10/keyedit.c:4231
 #, 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:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 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:4478
+#: g10/keyedit.c:4370
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5258,20 +5248,20 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Raderade %d signatur.\n"
 msgstr[1] "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "ogiltigt"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
@@ -5279,17 +5269,17 @@ msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Användaridentitet \"%s\": %d signaturer borttagna\n"
 msgstr[1] "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Användaridentitet \"%s\": redan minimerad\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Användaridentitet \"%s\": redan rensad\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5299,42 +5289,42 @@ msgstr ""
 "denna\n"
 "         nyckel inte användas i vissa versioner av PGP.\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användaridentiteten för spärrnyckeln: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, 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:4713
+#: g10/keyedit.c:4605
 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:4719
+#: g10/keyedit.c:4611
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: g10/keyedit.c:4788
+#: g10/keyedit.c:4680
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5344,183 +5334,183 @@ msgid ""
 msgstr ""
 "Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar utgångstid för en undernyckel.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 #, 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:4915
+#: g10/keyedit.c:4807
 #, 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:5033
+#: g10/keyedit.c:4925
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
 
-#: g10/keyedit.c:5039
+#: g10/keyedit.c:4931
 #, 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:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Välj endast en användaridentitet.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, 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:5368
+#: g10/keyedit.c:5262
 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:5450
+#: g10/keyedit.c:5344
 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:5451
+#: g10/keyedit.c:5345
 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:5516
+#: g10/keyedit.c:5410
 msgid "Enter the notation: "
 msgstr "Ange notationen: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 msgid "Proceed? (y/N) "
 msgstr "Fortsätt? (j/N) "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med indexet %d\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen användaridentitet med hashen %s\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, 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:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernyckel med indexet %d\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \"%s\"\n"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, 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:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 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:6078
+#: g10/keyedit.c:5972
 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:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr " (inte spärrbar)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "spärrad av din nyckel %s den %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du är på väg att spärra dessa signaturer:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "användaridentiteten \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, 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:6426
+#: g10/keyedit.c:6320
 #, 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:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, 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"
@@ -5564,33 +5554,33 @@ msgstr "för många chifferinställningar\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "ogiltig post \"%s\" i inställningssträngen\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "skriver direkt signatur\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "skriver självsignatur\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5598,19 +5588,19 @@ msgstr ""
 "VARNING: vissa OpenPGP-program kan inte hantera en DSA-nyckel med den här "
 "sammandragsstorleken\n"
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr "Signera"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr "Certifiera"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr "Kryptera"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr "Autentisera"
 
@@ -5628,185 +5618,185 @@ msgstr "Autentisera"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr "SsKkAaQq"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, 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:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr "För närvarande tillåtna åtgärder: "
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) Växla signeringsförmågan\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Växla krypteringsförmågan\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Växla autentiseringsförmågan\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Färdig\n"
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, 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:2131
+#: g10/keygen.c:2108
 #, 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:2134
+#: g10/keygen.c:2111
 #, 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:2136
+#: g10/keygen.c:2113
 #, 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:2142
+#: g10/keygen.c:2119
 #, 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:2144
+#: g10/keygen.c:2121
 #, 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:2150
+#: g10/keygen.c:2127
 #, 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:2152
+#: g10/keygen.c:2129
 #, 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:2158
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid "   (%d) sign, encrypt\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) signering, kryptering\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, 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:2163
+#: g10/keygen.c:2140
 #, 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:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) Befintlig nyckel\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, 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:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Ange nyckelhashen: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Ingen nyckel med denna nyckelhash\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 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:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Tillgängliga nycklar:\n"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, 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:2570
+#: g10/keygen.c:2547
 #, 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:2578
+#: g10/keygen.c:2555
 #, 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:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 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:2641
+#: g10/keygen.c:2618
 #, 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:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5823,7 +5813,7 @@ msgstr ""
 "      <n>y = nyckeln blir ogiltig efter n år\n"
 
 # borde kolla upp möjligheterna i källkoden att använda v m å istället för wmy
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5839,38 +5829,38 @@ msgstr ""
 "      <n>m = signaturen blir ogiltig efter n månader\n"
 "      <n>y = signaturen blir ogiltig efter n år\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen är giltig hur länge? (%s) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "ogiltigt värde\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr "Nyckeln går aldrig ut\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen går aldrig ut\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nyckeln går ut %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen går ut %s\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5878,11 +5868,11 @@ msgstr ""
 "Ditt system kan inte visa datum senare än år 2038.\n"
 "Datum fram till år 2106 kommer dock att hanteras korrekt.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr "Stämmer detta? (j/N) "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5897,7 +5887,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5915,42 +5905,42 @@ msgstr ""
 "    \"Gustav Vasa (Brutal kung) <gustav@trekronor.se>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "E-postadress: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "E-postadressen är ogiltig\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, 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:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5961,11 +5951,11 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 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:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr "En sådan användaridentitet finns redan på denna nyckel!\n"
 
@@ -5981,35 +5971,35 @@ msgstr "En sådan användaridentitet finns redan på denna nyckel!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 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:3142
+#: g10/keygen.c:3119
 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:3147
+#: g10/keygen.c:3124
 #, 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:3148
+#: g10/keygen.c:3125
 #, 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:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -6021,18 +6011,18 @@ msgstr ""
 "hårddisken) under primtalsgenereringen; detta ger slumptalsgeneratorn\n"
 "en större chans att samla ihop en tillräcklig mängd slumpmässig data.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -6040,73 +6030,73 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr ""
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, fuzzy, c-format
 #| msgid "key already exists\n"
 msgid "A key for \"%s\" already exists\n"
 msgstr "nyckeln finns redan\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 #, 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:4651
+#: g10/keygen.c:4622
 #, fuzzy, c-format
 #| msgid "generating new key\n"
 msgid "creating anyway\n"
 msgstr "genererar ny nyckel\n"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, 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:5239
+#: g10/keygen.c:5210
 #, 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:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, 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:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, 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:5644
+#: g10/keygen.c:5615
 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:5660
+#: g10/keygen.c:5631
 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"
@@ -6116,7 +6106,7 @@ msgstr ""
 "syfte.\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -6124,7 +6114,7 @@ msgstr ""
 "nyckeln är skapad %lu sekund in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -6132,23 +6122,23 @@ msgstr ""
 "nyckeln är skapad %lu sekunder in i framtiden (problemet är\n"
 "relaterat till tidsresande eller en felställd klocka)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, 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:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr "Verkligen skapa? (j/N) "
 
@@ -6156,27 +6146,43 @@ msgstr "Verkligen skapa? (j/N) "
 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"
@@ -6184,7 +6190,7 @@ msgid_plural "%d good signatures\n"
 msgstr[0] "%d felaktiga signaturer\n"
 msgstr[1] "%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"
@@ -6192,40 +6198,40 @@ msgid_plural "%d signatures not checked due to errors\n"
 msgstr[0] "1 signatur validerades inte eftersom ett fel uppstod\n"
 msgstr[1] "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"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Nyckelring"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "Primära nyckelns fingeravtryck:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr "Primära nyckelns fingeravtryck:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "   Undernyckelns fingeravtryck:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr "Nyckelns fingeravtryck ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr "       Kortets serienr ="
 
@@ -6614,7 +6620,7 @@ msgstr "binär"
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "okänd"
 
@@ -6759,30 +6765,30 @@ msgstr "Okomprimerad"
 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:1614
 #, 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:1639
 #, 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:1877
 #, 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:1899
 #, fuzzy, c-format
 #| msgid "Unknown signature type `%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6912,7 +6918,7 @@ msgid ""
 "%s"
 msgstr "%u-bitars %s-nyckel, id %s, skapad %s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6926,76 +6932,76 @@ msgstr ""
 "en mycket stor bild, så blir din nyckel också väldigt stor!\n"
 "Försök att använda en bild som har ungefär  formatet 240x288 pixlar.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Skriv JPEG-filnamnet för foto-id: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, 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:239
 #, 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:241
 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:257
 #, 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:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Är detta foto korrekt (j/N/a)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, 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:593
 #, 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:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "externt program avslutades felaktigt\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, 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:707
 #, 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:711
 #, 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:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -7003,7 +7009,7 @@ msgstr ""
 "anrop av externa program är inaktiverat pga osäkra behörigheter för\n"
 "inställningsfilen\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "kan inte visa foto-id!\n"
@@ -7342,12 +7348,12 @@ msgstr "okänd standardmottagare \"%s\"\n"
 msgid "no valid addressees\n"
 msgstr "inga giltiga adressater\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, 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:1768
+#: g10/pkclist.c:1766
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Observera: nyckeln %s har ingen inställning för %s\n"
@@ -8448,7 +8454,7 @@ msgstr "använder tillitsmodellen %s\n"
 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"
@@ -8483,7 +8489,7 @@ msgstr "gör en kontroll av tillitsdatabasen --check-trustdb\n"
 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"
@@ -8492,7 +8498,7 @@ msgstr[0] "%lu nycklar behandlade än så länge\n"
 msgstr[1] "%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"
@@ -8500,24 +8506,24 @@ msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] "%d nycklar behandlade (%d validity counts rensade)\n"
 msgstr[1] "%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 ""
@@ -8662,7 +8668,7 @@ msgstr ""
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8670,7 +8676,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8712,7 +8718,7 @@ msgstr "|A|Ange administratörens PIN-kod"
 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:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8801,59 +8807,59 @@ msgstr[1] "nyckelgenereringen är färdig (%d sekunder)\n"
 msgid "response does not contain the public key data\n"
 msgstr "svaret innehåller inte publikt nyckeldata\n"
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Ange administratörens PIN-kod"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 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:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, 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:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, 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:1654
+#: 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:1701
+#: 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:2074
+#: 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:2082
+#: 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:2092
+#: 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:2102
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8861,7 +8867,7 @@ msgstr ""
 "|NP|Ange en ny upplåsningskod (PUK-kod) för nyckeln att skapa kvalificerade "
 "signaturer med."
 
-#: scd/app-nks.c:2104
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8869,7 +8875,7 @@ msgstr ""
 "|P|Ange upplåsningskoden (PUK-koden) för nyckeln att skapa kvalificerade "
 "signaturer med."
 
-#: scd/app-nks.c:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 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"
@@ -9149,13 +9155,13 @@ msgstr "hanterare för fd %d startad\n"
 msgid "handler for fd %d terminated\n"
 msgstr "hanterare för fd %d avslutad\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -9164,11 +9170,11 @@ msgstr ""
 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:199 sm/certchain.c:2211
 msgid "chain"
 msgstr "kedja"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 msgid "shell"
 msgstr "skal"
 
@@ -9192,237 +9198,237 @@ msgstr "kritisk markerad policy utan konfigurerade policier"
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "misslyckades med att få fingeravtrycket\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, 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:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "antal utfärdare som matchar: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 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:793
 #, 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:818
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "antal matchande certifikat: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "misslyckades med att allokera keyDB-hanterare\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1260 sm/certchain.c:1264
 msgid "certificate has been revoked"
 msgstr "certifikatet har spärrats"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr "status för certifikatet är okänt"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, 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:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr "certifikatet är ännu inte giltigt"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 msgid "root certificate not yet valid"
 msgstr "rotcertifikatet är ännu inte giltigt"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1338 sm/certchain.c:1423
 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:1351 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr "certifikatet har gått ut"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 msgid "root certificate has expired"
 msgstr "rotcertifikatet har gått ut"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 msgid "intermediate certificate has expired"
 msgstr "tillfälligt certifikat har gått ut"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, 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:1404
 msgid "certificate with invalid validity"
 msgstr "certifikat med felaktig giltighetstid"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr "signaturen inte skapad under certifikatets livstid"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr "certifikatet skapades inte under utfärdarens livstid"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 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:1448
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (  signatur skapad "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (certifikat skapat "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (certifikat giltigt från "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     utfärdare giltig från "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "fingeravtryck=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, 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:1505
 #, 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:1511
 #, 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:1570
 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:1634
 msgid "no issuer found in certificate"
 msgstr "ingen utfärdare hittades i certifikatet"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 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:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "rotcertifikatet har inte markerats som betrott"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, 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:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr "utfärdarens certifikat hittades inte"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, 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:1911 dirmngr/validate.c:693
 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:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr "certifikatet är korrekt\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "tillfälligt certifikat är korrekt\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, c-format
 msgid "root certificate is good\n"
 msgstr "rotcertifikatet är korrekt\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr "växlar till kedjemodell"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr "valideringsmodell använd: %s"
@@ -9445,7 +9451,7 @@ msgstr "slut på minne\n"
 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:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "ingen"
 
@@ -9480,46 +9486,46 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "skapad %s, går ut %s.\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, 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:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, 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:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, 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:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, 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:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, 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:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certifikatet är inte användbart för kryptering\n"
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certifikatet är inte användbart för signering\n"
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "Included certificates"
 msgid "looking for another certificate\n"
@@ -10118,7 +10124,7 @@ msgstr "hashalgoritm som används för signerare %d: %s (%s)\n"
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "sökande efter kvalificerat certifikat misslyckades: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
@@ -10336,7 +10342,7 @@ msgstr "mottagande rad misslyckades: %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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing cache file: %s\n"
@@ -10607,223 +10613,223 @@ msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1849 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:1923
 #, 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:1938
 #, 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:1945
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, 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:1984
 #, 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:2011
 #, 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:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, 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:2084
 #, 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:2226
 #, 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:2233
 #, 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:2267
 #, 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:2271
 #, 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:2281
 #, 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:2291
 #, 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:2301
 #, 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:2308
 #, 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:2333
 #, c-format
 msgid "WARNING: new CRL still too old; it expired on %s - loading anyway\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2336
+#: dirmngr/crlcache.c:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, 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:2414
 #, 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:2446
 #, 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:2460
 #, 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:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 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:2523
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, 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:2558
 #, 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:2569
 #, 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:2600
 #, 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:2603
 msgid "End CRL dump\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, 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:2733
+#: dirmngr/crlcache.c:2734
 #, 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:2779
+#: dirmngr/crlcache.c:2780
 #, fuzzy, c-format
 #| msgid "receiving line failed: %s\n"
 msgid "crl_cache_insert via issuer failed: %s\n"
@@ -11223,13 +11229,13 @@ msgstr "användning: gpgsm [flaggor] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, 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:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' failed: %s\n"
 msgid "processing CRL from '%s' failed: %s\n"
@@ -11500,103 +11506,103 @@ msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr ""
 
-#: dirmngr/ocsp.c:582
+#: 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:598 dirmngr/ocsp.c:782
+#: 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:642
+#: 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:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, fuzzy, c-format
 #| msgid "issuer certificate not found"
 msgid "issuer certificate not found: %s\n"
 msgstr "utfärdarens certifikat hittades inte"
 
-#: dirmngr/ocsp.c:691
+#: 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:698
+#: 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:708
+#: 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:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:753
+#: 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:760
+#: 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:765
+#: 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:822
+#: 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:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr ""
 
-#: dirmngr/ocsp.c:854
+#: 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:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr ""
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr ""
@@ -11611,72 +11617,72 @@ msgstr "sändande rad misslyckades: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, 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:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, 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:1743
 #, 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:1776
 #, 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:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr ""
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, 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:3033
+#: dirmngr/server.c:3049
 #, 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:3054
+#: dirmngr/server.c:3070
 #, 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:3062
+#: dirmngr/server.c:3078
 #, 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:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr ""
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, fuzzy, c-format
 #| msgid "signing failed: %s\n"
 msgid "Assuan processing failed: %s\n"
@@ -12032,92 +12038,108 @@ msgstr ""
 "Syntax: gpg-check-pattern [flaggor] mönsterfil\n"
 "Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: 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:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: tools/gpg-card.c:3758
 #, fuzzy
 #| msgid "  (certificate created at "
 msgid "authenticate to the card"
 msgstr "  (certifikat skapat "
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: 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:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3707
+#: 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:3708
+#: 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:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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 "
diff --git a/po/tr.gmo b/po/tr.gmo
index 3a10995..88ce4e8 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index 6174b8f..497b29e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.3.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2022-04-23 15:00+0300\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: Turkish\n"
@@ -144,8 +144,8 @@ msgstr "PIN:"
 msgid "Passphrase:"
 msgstr "Anahtar Parolası:"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "eÅŸleÅŸmiyor - yeniden deneyin"
 
@@ -194,17 +194,17 @@ msgstr "Not: İstek, bir web tarayıcısından yapıldı."
 msgid "Note: Request from a remote site."
 msgstr "Not: İstek, uzak bir konumdan yapıldı."
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, 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:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Lütfen bu anahtar parolasını yeniden girin"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -212,7 +212,7 @@ msgid ""
 msgstr ""
 "İçe aktarılan nesneyi %s sisteminde koruyacak anahtar parolasını girin."
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -225,25 +225,25 @@ msgstr ""
 msgid "ssh keys greater than %d bits are not supported\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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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"
 
-#: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
+#: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "'%s' açılamıyor: %s\n"
@@ -253,13 +253,13 @@ msgstr "'%s' açılamıyor: %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "uygun bir kart anahtarı yok: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "kart listesi alınırken hata: %s\n"
 
 # Check
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -268,20 +268,20 @@ 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:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Ä°zin ver"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Reddet"
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Lütfen%%0A  %F%%0A  (%c) ssh anahtarı için anahtar parolasını giriniz"
 
-#: agent/command-ssh.c:3100
+#: agent/command-ssh.c:3105
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -290,7 +290,7 @@ msgstr ""
 "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:3797
+#: agent/command-ssh.c:3837
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "soketten akım oluşturulamadı: %s\n"
@@ -414,206 +414,212 @@ msgstr "Yeni anahtarınızı korumak için lütfen%0Aanahtar parolanızı girin"
 msgid "Please enter the new passphrase"
 msgstr "Lütfen yeni anahtar parolasını girin"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr "Başlangıçta kullanılan seçenekler"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr "ardalan süreci olarak çalıştır"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr "sunucu kipinde (önalanda) çalıştır"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "konsoldan ayırma"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr "sh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr "csh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|seçenekleri FILE'dan oku"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr "Tanı çıktısını denetleyen seçenekler"
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "ayrıntılı"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "biraz daha sessiz ol"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|sunucu kipi günlüklerini FILE'a yaz"
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr "Yapılandırmayı denetleyen seçenekler"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 msgid "do not use the SCdaemon"
 msgstr "SCdaemon kullanma"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "[PGM|SCdaemon programı olarak PGM kullan"
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "[PGM|tpm2daemon programı olarak PGM kullan"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|NAME aracılığıyla bazı komutları kabul et"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr "TTY deÄŸiÅŸtirme isteklerini yok say"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr "X ekranını değiştirme isteklerini yok say"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 msgid "enable ssh support"
 msgstr "ssh desteÄŸini etkinleÅŸtir"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|ssh parmak izlerini göstermek için ALGO kullan"
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 msgid "enable putty support"
 msgstr "putty desteÄŸini etkinleÅŸtir"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "putty desteÄŸini etkinleÅŸtir"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "Güvenliği denetleyen seçenekler"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|arabellekteki PIN'leri N saniyede zaman aşımına uğrat"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|SSH anahtarlarını N saniyede zaman aşımına uğrat"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|azami PIN önbelleği ömrünü N saniye olarak ayarla"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|azami SSH anahtarı ömrünü N saniye olarak ayarla"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr "imzalarken PIN arabelleÄŸini kullanma"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 msgid "disallow the use of an external password cache"
 msgstr "eski anahtar parolalarının yeniden kullanılmasına izin verme"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verme"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 msgid "allow presetting passphrase"
 msgstr "anahtar parolasının önceden ayarlanmasına izin ver"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr "Bir anahtar parolası kuralını zorlayan seçenekler"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr "anahtar parolası poliçesinin atlanmasına izin verme"
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|en kısa yeni anahtar parolası uzunluğunu N olarak ayarla"
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 "|N|yeni anahtar parolası için en azından N harf olmayan karakter gerektir"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|yeni anahtar parolalarını FILE'daki dizgilere göre denetle"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|anahtar parolalarının N gün sonra zaman aşımına uğrat"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 msgid "do not allow the reuse of old passphrases"
 msgstr "eski anahtar parolaların yeniden kullanılmasına izin verme"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr "PIN girişini denetleyen seçenekler"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 msgid "never use the PIN-entry"
 msgstr "PIN girişini hiçbir zaman kullanma"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr "arayanın pin girişini geçersiz kılmasına izin verme"
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "PIN girişinin klavye ve fareyi yakalamasına izin ver"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|PIN giriş uygulaması olarak PGM kullan"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|pin giriş zaman aşımını N saniye olarak ayarla"
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 msgid "allow passphrase to be prompted through Emacs"
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Bulduğunuz hataları lütfen <@EMAIL@> adresine bildirin.\n"
 
-#: agent/gpg-agent.c:570
+#: agent/gpg-agent.c:582
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Kullanım: @GPG_AGENT@ [seçenekler] (yardım için -h)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -621,135 +627,135 @@ msgstr ""
 "Sözdizim: @GPG_AGENT@ [seçenekler] [komut [argümanlar]\n"
 "@GNUPG@ için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "geçersiz hata ayıklama düzeyi '%s' verildi\n"
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçili özet algoritması geçersiz\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "seçenekler, '%s' ögesinden okunuyor\n"
 
-#: agent/gpg-agent.c:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 tools/gpg-connect-agent.c:1284 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Not: '%s', bir seçenek olarak kabul edilmiyor\n"
 
-#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "UYARI: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "soket oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "soket adı '%s' pek uzun\n"
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "çalışmakta olan %s ögesinden soket aşırılmaya çalışılıyor\n"
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, 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:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "soket için tuz alınırken hata\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "soket '%s' ögesine bağlanırken hata: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "'%s' izinleri ayarlanamıyor: %s\n"
 
-#: agent/gpg-agent.c:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "'%s' soketinde dinleniyor\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "'%s' dizini oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "'%s' dizini oluÅŸturuldu\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "'%s' için stat() başarısız oldu: %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "'%s', ev dizini olarak kullanılamıyor\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "tutaç 0x%lx, fd %d için başlatıldı\n"
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "tutaç 0x%lx, fd %d için sonlandırıldı\n"
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh tutacı 0x%lx, fd %d için başlatıldı\n"
 
-#: agent/gpg-agent.c:2853
+#: agent/gpg-agent.c:2967
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh tutacı 0x%lx, fd %d için sonlandırıldı\n"
 
-#: agent/gpg-agent.c:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect başarısız: %s - 1sn bekliyor\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s durdu\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1027,7 +1033,7 @@ msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 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
+#: agent/cvt-openpgp.c:343 g10/card-util.c:1602
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "genel anahtar algoritması %d (%s), desteklenmiyor\n"
@@ -1042,52 +1048,52 @@ msgstr "koruma algoritması %d (%s), desteklenmiyor\n"
 msgid "protection hash algorithm %d (%s) is not supported\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 "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
 #, c-format
 msgid "error creating a stream for a pipe: %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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, c-format
 msgid "error forking process: %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 "%d işleminin sonlanmasını bekleme başarısız: %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' ç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
+#: 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ıştırılırken hata: Çıkış durumu: %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' çalıştırılırken hata: Sonlandırıldı\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 "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 "%d işleminin çıkış kodu alınırken hata: %s\n"
@@ -1117,18 +1123,18 @@ msgstr "Uyarı: %s üzerinde güvenli olmayan iyelik: \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Uyarı: %s üzerinde güvenli olmayan izinler: \"%s\"\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "'%s' dosyasının erişilebilir olması için bekleniyor ...\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, c-format
 msgid "renaming '%s' to '%s' failed: %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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "evet"
 
@@ -1182,8 +1188,8 @@ msgstr "%lu bayt ayrılırken güvenli bellekte çekirdek dışına çıkıldı"
 msgid "out of core while allocating %lu bytes"
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 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"
@@ -1203,68 +1209,68 @@ msgstr "UYARI: \"%s%s\" seçeneği eskidi - artık etkisiz\n"
 msgid "unknown debug flag '%s' ignored\n"
 msgstr "bilinmeyen hata ayıklama bayrağı '%s' yok sayıldı\n"
 
-#: common/asshelp.c:348
+#: common/asshelp.c:342
 #, c-format
 msgid "waiting for the dirmngr to come up ... (%ds)\n"
 msgstr "dirmngr'nin gelmesi bekleniyor ... (%ds)\n"
 
-#: common/asshelp.c:350
+#: common/asshelp.c:344
 #, c-format
 msgid "waiting for the keyboxd to come up ... (%ds)\n"
 msgstr "keyboxd'nin gelmesi bekleniyor ... (%ds)\n"
 
-#: common/asshelp.c:351
+#: common/asshelp.c:345
 #, c-format
 msgid "waiting for the agent to come up ... (%ds)\n"
 msgstr "aracının gelmesi bekleniyor ... (%ds)\n"
 
-#: common/asshelp.c:364
+#: common/asshelp.c:358
 #, c-format
 msgid "connection to the dirmngr established\n"
 msgstr "dirmngr bağlantısı kuruldu\n"
 
-#: common/asshelp.c:366
+#: common/asshelp.c:360
 #, c-format
 msgid "connection to the keyboxd established\n"
 msgstr "keyboxd bağlantısı kuruldu\n"
 
-#: common/asshelp.c:367
+#: common/asshelp.c:361
 #, c-format
 msgid "connection to the agent established\n"
 msgstr "aracı bağlantısı kuruldu\n"
 
-#: common/asshelp.c:485
+#: common/asshelp.c:479
 #, c-format
 msgid "no running %s - starting '%s'\n"
 msgstr "çalışan %s yok - '%s' başlatılıyor\n"
 
-#: common/asshelp.c:588
+#: common/asshelp.c:582
 #, c-format
 msgid "connection to the agent is in restricted mode\n"
 msgstr "aracı bağlantısı kısıtlı kipte\n"
 
-#: common/asshelp.c:725
+#: common/asshelp.c:719
 #, c-format
 msgid "error getting version from '%s': %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 "'%s' sunucusu bizden daha eski (%s < %s)"
 
-#: common/asshelp.c:737 g10/call-dirmngr.c:432 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 "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
+#: common/asshelp.c:736
 #, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "Not: Onları yeniden başlatmak için \"%s\" komutunu kullanın.\n"
@@ -1412,11 +1418,11 @@ msgstr "Sertifika zinciri geçerli"
 msgid "Root certificate trustworthy"
 msgstr "Kök sertifikası güvenilir"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 msgid "no CRL found for certificate"
 msgstr "sertifika için bir CRL yok"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 msgid "the available CRL is too old"
 msgstr "mevcut CRL çok eski"
 
@@ -1453,7 +1459,7 @@ msgstr "'%s' için yardım mevcut değil."
 msgid "ignoring garbage line"
 msgstr "anlamsız satır yok sayılıyor"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "[none]"
 msgstr "[yok]"
 
@@ -1497,36 +1503,36 @@ msgstr "iconv_open başarısız: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "'%s' > '%s' dönüşümü başarısız: %s\n"
 
-#: common/dotlock.c:728
+#: 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"
 
-#: common/dotlock.c:790
+#: common/dotlock.c:785
 #, c-format
 msgid "error writing to '%s': %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 tutuluyor) %s...\n"
 
-#: common/dotlock.c:1203
+#: common/dotlock.c:1198
 msgid "(deadlock?) "
 msgstr "(ölükilit?) "
 
-#: common/dotlock.c:1242
+#: common/dotlock.c:1237
 #, c-format
 msgid "lock '%s' not made: %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"
@@ -1536,92 +1542,92 @@ msgstr "%s kilidi için bekleniyor...\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s çok eski (gereken %s, sizinki %s)\n"
 
-#: g10/armor.c:441
+#: 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 "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 "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 "beklenmedik dosya sonu (CRC yok)\n"
 
-#: g10/armor.c:1095
+#: g10/armor.c:1110
 #, c-format
 msgid "premature eof (in CRC)\n"
 msgstr "beklenmedik dosya sonu (CRC içinde)\n"
 
-#: g10/armor.c:1103
+#: g10/armor.c:1118
 #, c-format
 msgid "malformed CRC\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 "beklenmedik dosya sonu (artbilgi içinde)\n"
 
-#: g10/armor.c:1131
+#: g10/armor.c:1146
 #, c-format
 msgid "error in trailer line\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"
 
-#: g10/armor.c:1546
+#: g10/armor.c:1566
 #, c-format
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
@@ -1629,12 +1635,12 @@ msgstr ""
 "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:1462
+#: g10/build-packet.c:1480
 #, c-format
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "[ insan okuyabilir biçimde değil (%zu bayt: %s%s) ]"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1643,34 +1649,34 @@ msgstr ""
 "bir simgelem adı yalnızca harfler, rakamlar ve altçizgiler içerebilir ve bir "
 "'=' ile sonlanmalıdır\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "bir kullanıcı simgelem adı '@' karakteri içermelidir\n"
 
-#: g10/build-packet.c:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "bir simgelem adının birden çok '@' karakteri içermemesi gerekir\n"
 
-#: g10/build-packet.c:1550
+#: g10/build-packet.c:1568
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "bir simgelem değerinde denetim karakterleri kullanılamaz\n"
 
-#: g10/build-packet.c:1606
+#: g10/build-packet.c:1624
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "bir simgelem adı, bir '=' karakteri içeremez\n"
 
-#: g10/build-packet.c:1612
+#: g10/build-packet.c:1630
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr ""
 "bir simgelem adı, yalnızca yazdırılabilir karakterler veya boşluklar "
 "içermelidir\n"
 
-#: g10/build-packet.c:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "UYARI: Geçersiz simgelem verisi bulundu\n"
@@ -1684,7 +1690,7 @@ msgstr "istemciye %s sorgusu vekille aktarılamadı\n"
 msgid "Enter passphrase: "
 msgstr "Anahtar parolasını girin: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 g10/sign.c:473
 #: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
@@ -1701,7 +1707,7 @@ msgstr "TPM kaynaklı hata: %s\n"
 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:2330
+#: 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 bir dirmngr yok\n"
@@ -1741,169 +1747,169 @@ msgstr "sunucudan kabul edilemeyen HTTP yeniden yönlendirmesi temizlendi"
 msgid "server uses an invalid certificate"
 msgstr "sunucu geçersiz bir sertifika kullanıyor"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 sm/call-dirmngr.c:457
 #, c-format
 msgid "Note: %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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, c-format
 msgid "OpenPGP card no. %s detected\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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 g10/revoke.c:214 g10/revoke.c:639
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "bu, toplu iş kipinde yapılamaz\n"
 
-#: g10/card-util.c:105 tools/gpg-card.c:2974
+#: 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 yalnızca 2. sürüm kartlar için kullanılabilir\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: 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:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "Bay"
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "Bayan"
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "zorlanmadı"
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "zorlandı"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 tools/gpg-card.c:1502
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Hata: Şimdilik yalnızca US-ASCII mümkün.\n"
 
-#: g10/card-util.c:803 tools/gpg-card.c:1500
+#: g10/card-util.c:803 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:1502
+#: g10/card-util.c:805 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:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Kart iyesinin soyadı: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Kart iyesinin adı: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 tools/gpg-card.c:1557
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Hata: Bileştirilmiş adlar çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:868 tools/gpg-card.c:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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"
 
-#: g10/card-util.c:1024 tools/gpg-card.c:1680
+#: g10/card-util.c:1023 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:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "Özel DO verisi: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "Dil tercihleri: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 tools/gpg-card.c:1744
 #, c-format
 msgid "Error: invalid length of preference string.\n"
 msgstr "Hata: Tercih dizisinin uzunluğu geçersiz.\n"
 
-#: g10/card-util.c:1164 tools/gpg-card.c:1749
+#: g10/card-util.c:1163 tools/gpg-card.c:1753
 #, c-format
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Hata: Tercih dizisindeki karakterler geçersiz.\n"
 
-#: g10/card-util.c:1186 tools/gpg-card.c:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr "Hitap: (M = Bay, F = Bayan veya boÅŸluk): "
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Hata: Geçersiz yanıt.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "CA parmak izi: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hata: Geçersiz biçimlendirilmiş parmak izi.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1296
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "anahtar işlemi olanaklı değil: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1297
 msgid "not an OpenPGP card"
 msgstr "bir OpenPGP kartı değil"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, 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:1395
 msgid "Replace existing key? (y/N) "
 msgstr "Mevcut anahtar başkasıyla değiştirilsin mi? (e/H) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -1915,101 +1921,101 @@ msgstr ""
 "     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:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Ä°stediÄŸiniz anahtar boyutu nedir? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 sm/certreqgen-ui.c:185
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s anahtar uzunlukları %u-%u eriminde olmalı\n"
 
-#: g10/card-util.c:1471
+#: g10/card-util.c:1470
 msgid "Changing card key attribute for: "
 msgstr "Şunun için anahtar özniteliği değiştiriliyor: "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 msgid "Signature key\n"
 msgstr "İmzalama anahtarı\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 msgid "Encryption key\n"
 msgstr "Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr "Kimlik doğrulama anahtarı\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 sm/certreqgen-ui.c:158
 msgid "Please select what kind of key you want:\n"
 msgstr "Lütfen istediğiniz anahtar türünü seçiniz:\n"
 
-#: g10/card-util.c:1480 sm/certreqgen-ui.c:159
+#: g10/card-util.c:1479 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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
+#: g10/card-util.c:1609
 #, c-format
 msgid "error changing key attribute for key %d: %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
+#: g10/card-util.c:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, c-format
 msgid "error getting card info: %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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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 "Bu komut, bu kart tarafından desteklenmiyor\n"
 
-#: g10/card-util.c:1678 tools/gpg-card.c:2457
+#: g10/card-util.c:1677 tools/gpg-card.c:2461
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Şifre anahtarının kart dışında bir yedeği yapılsın mı? (E/h) "
 
-#: g10/card-util.c:1692
+#: g10/card-util.c:1691
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "Not: Anahtarlar halihazırda kart üzerinde depolanıyor!\n"
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2429
+#: g10/card-util.c:1694 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "Mevcut anahtarlar başkalarıyla değiştirilsin mi? (e/H) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2020,176 +2026,176 @@ msgstr ""
 "   PIN = '%s'     Admin PIN = '%s'\n"
 "Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 msgid "Please select the type of key to generate:\n"
 msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
 
-#: g10/card-util.c:1744 g10/card-util.c:1834
+#: g10/card-util.c:1743 g10/card-util.c:1833
 msgid "   (1) Signature key\n"
 msgstr "   (1) İmzalama anahtarı\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1744 g10/card-util.c:1835
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik doğrulama anahtarı\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 msgid "Please select where to store the key:\n"
 msgstr "Lütfen anahtarın depolanacağı yeri seçiniz:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1876
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD başarısız: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 tools/gpg-card.c:3100
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "Not: Bu komut kartta depolanan tüm anahtarları yok eder!\n"
 
-#: g10/card-util.c:1985 tools/gpg-card.c:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 tools/gpg-card.c:3103 tools/gpg-card.c:3444
 msgid "Continue? (y/N) "
 msgstr "Sürdürülsün mü? (e/H) "
 
-#: g10/card-util.c:1990 tools/gpg-card.c:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "İlk ayarlara sıfırlamak istediğinize emin misiniz? (\"yes\" girin) "
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "KDF ayarlanırken hata: %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2228
 #, c-format
 msgid "error for setup UIF: %s\n"
 msgstr "UIF ayarlanırken hata: %s\n"
 
-#: g10/card-util.c:2253 g10/keyedit.c:1263 tools/gpg-card.c:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr "yönetici komutlarını göster"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "bu yardımı göster"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "tüm kullanılabilir veriyi listele"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "kart iyesinin adını değiştir"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "anahtarın alınacağı URL'yi değiştir"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3689
+#: g10/card-util.c:2262 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr "kart URL'sinde belirtilmiş anahtarı al"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "oturum açma adını değiştir"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "dil tercihlerini deÄŸiÅŸtir"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr "kart iyesinin hitabını değiştir"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "bir CA parmak izini deÄŸiÅŸtir"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "imza zorlama PIN'i bayrağını değiştir"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "yeni anahtarlar oluÅŸtur"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "PIN'i değiştirme veya blokunu kaldırma menüsü"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3698
+#: g10/card-util.c:2271 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "PIN'i doğrula ve tüm veriyi listele"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "bir sıfırlama kodu kullanarak PIN'in blokunu kaldır"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr "tüm anahtarları ve veriyi yok et"
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "KDF'yi PIN kimlik doğrulaması için ayarla (on/single/off)"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2276
 msgid "change the key attribute"
 msgstr "anahtar özniteliğini değiştir"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 tools/gpg-card.c:3763
 msgid "change the User Interaction Flag"
 msgstr "Kullanıcı etkileşim bayrağını değiştir"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 msgid "Admin-only command\n"
 msgstr "Yöneticiye özel komut\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr "Yönetici komutlarına izin verilir\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 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:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 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:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "'%s' açılamıyor\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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\" anahtarı bulunamadı: %s\n"
 
-#: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 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 +2253,9 @@ msgstr "anahtar"
 msgid "subkey"
 msgstr "yardımcı anahtar"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
@@ -2280,18 +2286,18 @@ 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:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, c-format
 msgid "cipher algorithm '%s' may not be used for encryption\n"
 msgstr "şifreleme algoritması '%s', şifreleme için kullanılamayabilir\n"
 
-#: g10/encrypt.c:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr "(geçersiz kılmak için \"%s\" seçeneğini kullanın)\n"
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "şifreleme algoritması '%s', %s kipinde kullanılamayabilir\n"
@@ -2301,43 +2307,44 @@ msgstr "şifreleme algoritması '%s', %s kipinde kullanılamayabilir\n"
 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:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "anahtar parolası oluşturulurken hata: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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 kipi sayesinde bir simetrik ESK paketi kullanılamıyor\n"
 
-#: g10/encrypt.c:512
+#: g10/encrypt.c:503
 #, c-format
 msgid "using cipher %s.%s\n"
 msgstr "%s.%s şifrelemesi kullanılıyor\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s' halihazırda sıkıştırılmış\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "UYARI: '%s', boÅŸ bir dosya\n"
 
-#: g10/encrypt.c:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, 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:862
+#: g10/encrypt.c:853
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "'%s konumundan okunuyor\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2346,12 +2353,12 @@ msgstr ""
 "UYARI: %s (%d) sıkıştırma algoritmasını zorlamak alıcı tercihlerine karşı "
 "geliyor\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, c-format
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s.%s, şunun için şifrelendi: \"%s\"\n"
 
-#: g10/encrypt.c:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "'%s' seçeneği, %s kipinde kullanılamayabilir\n"
@@ -2377,62 +2384,74 @@ msgstr "UYARI: İleti simetrik şifre içindeki zayıf bir anahtarla şifrelendi
 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 "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) 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ı dışa aktar"
 
-#: g10/export.c:125
+#: g10/export.c:131
 msgid "remove unusable parts from key during export"
 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 "dışa aktarım sırasında anahtardan olabildiğince çok şey kaldır"
 
-#: g10/export.c:132
+#: g10/export.c:138
+#, fuzzy
+#| msgid "generate a revocation certificate"
+msgid "export only revocation certificates"
+msgstr "bir yürürlükten kaldırma sertifikası üret"
+
+#: g10/export.c:141
 msgid "use the GnuPG key backup format"
 msgstr "GnuPG yedekleme biçimini kullan"
 
-#: 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 "gizli anahtarların dışa aktarımına izin verilmez\n"
+
+#: g10/export.c:1525
 msgid " - skipped"
 msgstr " - atlandı"
 
-#: g10/export.c:1333 g10/import.c:2132 g10/openfile.c:202 g10/openfile.c:296
+#: g10/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, c-format
 msgid "writing to '%s'\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 "%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 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 "%s anahtarı: PGP 2.x tarzı bir anahtar - atlandı\n"
 
-#: g10/export.c:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: Hiçbir şey dışa aktarılmadı\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2498,7 +2517,7 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "%s asıl anahtarı yerine %s yardımcı anahtarı kullanılıyordu\n"
 
-#: g10/getkey.c:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "'%s' seçeneği için geçerli değerler:\n"
@@ -2571,111 +2590,111 @@ msgstr "tez bir kullanıcı kimliğini yürürlükten kaldır"
 msgid "quickly set a new expiration date"
 msgstr "tez yeni bir son kullanım tarihi ayarla"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr "tam özellikli anahtar çifti üretimi"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üret"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden sil"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden sil"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "quickly sign a key"
 msgstr "tez bir anahtar imzala"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 msgid "quickly sign a key locally"
 msgstr "tez bir anahtarı yerel olarak imzala"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "quickly revoke a key signature"
 msgstr "tez bir anahtar imzasını yürürlükten kaldır"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "bir anahtar imzala"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzala"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenle ve imzala"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "anahtar parolasını değiştir"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "anahtarları dışa aktar"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "anahtarları bir anahtar sunucusuna dışa aktar"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan içe aktar"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "bir anahtar sunucusunda anahtar ara"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan güncelle"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "anahtar içe aktar/birbiriyle birleştir"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr "kart durumunu yazdır"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr "kart üzerindeki veriyi değiştir"
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr "bir kartın PIN'ini değiştir"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "güvence veritabanını güncelle"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 msgid "print message digests"
 msgstr "ileti özetlerini göster"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "sunucu kipinde çalış"
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|bir düğme için TOFU poliçesini ayarla"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|öntanımlı gizli anahtar olarak NAME'i kullan"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|kullanıcı NAME kimliği için de şifreleme yapar"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|e-posta armalarını ayarla"
 
@@ -2691,53 +2710,53 @@ msgstr "hiçbir değişiklik yapma"
 msgid "prompt before overwriting"
 msgstr "üzerine yazmadan önce sor"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr "Girdiyi denetleyen seçenekler"
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr "Çıktıyı denetleyen seçenekler"
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluştur"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|çıktıyı FILE'a yaz"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullan"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|sıkıştırma düzeyini N olarak ayarla (0 devre dışı bırakır)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr "Anahtar içe/dışa aktarmayı denetleyen seçenekler"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 "|MECHANISMS|anahtarları posta adreslerine göre konumlamak için MECHANISMS'i "
 "kullan"
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 msgid "import missing key from a signature"
 msgstr "eksik anahtarı bir imzadan içe aktar"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 msgid "include the public key in signatures"
 msgstr "imzalarda genel anahtarı içer"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "dirmngr'a tüm erişimi devre dışı bırak"
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr "Anahtar listelemelerini denetleyen seçenekler"
 
@@ -2761,7 +2780,7 @@ msgstr "Katılınmayan kullanım için seçenekler"
 msgid "Other options"
 msgstr "Diğer seçenekler"
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2769,7 +2788,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin tam bir listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2789,11 +2808,11 @@ msgstr ""
 " --list-keys [adlar]        anahtarları göster\n"
 " --fingerprint [adlar]      parmak izlerini göster\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Kullanım: @GPG@ [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1172
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2803,7 +2822,7 @@ msgstr ""
 "İmzala, denetle, şifrele veya şifre çöz\n"
 "Öntanımlı işlem girilen veri ile bağıntılıdır\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2811,568 +2830,559 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Åžifre: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "SaÄŸlama: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "kullanım: %s [seçenekler] %s\n"
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "çakışan komutlar\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "hayır = '%s' grup tanımında imza bulundu\n"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1698
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "UYARI: '%s' ev dizininde güvenli olmayan iyelik\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvenli olmayan iyelik\n"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvenli olmayan iyelik\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "UYARI: '%s' ev dizininde güvenli olmayan izinler\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvenli olmayan izinler\n"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvenli olmayan izinler\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "UYARI: '%s' ev dizinindeki ilgili dizinin iyeliği güvenli değil\n"
 
-#: g10/gpg.c:1735
+#: g10/gpg.c:1725
 #, 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üvenli değil\n"
 
-#: g10/gpg.c:1738
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvenli değil\n"
 
-#: g10/gpg.c:1744
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "UYARI: '%s' ev dizinindeki ilgili dizinin izinleri güvenli değil\n"
 
-#: g10/gpg.c:1747
+#: g10/gpg.c:1737
 #, 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üvenli değil\n"
 
-#: g10/gpg.c:1750
+#: g10/gpg.c:1740
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvenli değil\n"
 
-#: g10/gpg.c:1966
+#: g10/gpg.c:1956
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "bilinmeyen yapılandırma öğesi '%s'\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr "anahtarların listelenmesi sırasında fotoğraf kimlikleri göster"
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 msgid "show key usage information during key listings"
 msgstr "anahtar listelemesi sırasında kullanım bilgisi göster"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr "imza listelemesi sırasında poliçe URL'leri göster"
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 msgid "show all notations during signature listings"
 msgstr "imza listelemesi sırasında tüm simgelemi göster"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr "imza listelemesi sırasında IETF standart simgelemlerini göster"
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri göster"
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "imza listelemesi sırasında tercih edilen anahtar sunucusu URL'leri göster"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr "anahtar listelemesi sırasında kullanıcı kimliği geçerliliğini göster"
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "anahtar listelerinde yürürlükten kaldırılmış ve zaman aşımına uğramış "
 "kullanıcı kimlikleri göster"
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 "anahtar listelerinde yürürlükten kaldırılmış ve zaman aşımına uğramış "
 "yardımcı anahtarlar göster"
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 msgid "show the keyring name in key listings"
 msgstr "anahtar zinciri adını anahtar listelerinde göster"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 msgid "show expiration dates during signature listings"
 msgstr "imza listelemesi sırasında zaman aşımı tarihleri göster"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "tercihleri listele (uzman)"
+
+#: g10/gpg.c:2197
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "bilinmeyen TOFU poliçesi '%s'\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(seçimleri listelemek için \"help\" kullanın)\n"
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/gpg.c:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Not: %s, normal kullanım için değildir!\n"
 
-#: g10/gpg.c:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' geçerli bir imza zaman aşımı değil\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\", geçerli bir e-posta adresi değil\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "geçersiz pin girdisi kipi '%s'\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "geçersiz istek kaynağı '%s\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, 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:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusu URL'si ayrıştırılamadı\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: Geçersiz anahtar sunucusu seçenekleri\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "geçersiz anahtar sunucusu seçenekleri\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: Geçersiz içe aktarma seçenekleri\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "geçersiz içe aktarma seçenekleri\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "geçersiz süzgeç seçeneği: %s\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: Geçersiz dışa aktarma seçenekleri\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "geçersiz dışa aktarma seçenekleri\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: Geçersiz liste seçenekleri\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr "geçersiz liste seçenekleri\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr "imza doğrulaması sırasında fotoğraf kimlikleri göster"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr "imza doğrulaması sırasında poliçe adresleri göster"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 msgid "show all notations during signature verification"
 msgstr "imza doğrulaması sırasında tüm simgelemi göster"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr "imza doğrulaması sırasında IETF standart simgelemlerini göster"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri göster"
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "imza doğrulaması sırasında tercih edilen anahtar sunucusu URL'leri göster"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 msgid "show user ID validity during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kimliği geçerliliğini göster"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "imza doğrulamasında yürürlükten kaldırılan ve süresi geçen kullanıcı "
 "kimliklerini göster"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 msgid "show only the primary user ID in signature verification"
 msgstr "imza doğrulamasında yalnızca asıl kullanıcı kimliği göster"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: Geçersiz doğrulama seçenekleri\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr "geçersiz doğrulama seçenekleri\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirler yolu %s olarak ayarlanamıyor\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: Geçersiz auto-key-locate listesi\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "geçersiz auto-key-locate listesi\n"
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "\"%.50s\" seçeneği için geçersiz argüman\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: Program bir çekirdek dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s, %s ögesini geçersiz kılıyor\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ve %s birlikte kullanılamaz!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile bir anlam ifade etmiyor!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "UYARI: Sahte sistem zamanıyla çalışıyor: "
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, 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:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3952
-#, c-format
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "seçili AEAD algoritması geçersiz\n"
-
-#: g10/gpg.c:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçili sıkıştırma algoritması geçersiz\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçili sertifikalama özet algoritması geçersiz\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0'dan büyük olmalı\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1'den büyük olmalı\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "\"max-cert-depth\" 1-255 arasında olmalı\n"
 
-#: g10/gpg.c:3991
+#: g10/gpg.c:3954
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı sertifika düzeyi geçersiz; 0, 1, 2 veya 3 olmalı\n"
 
-#: g10/gpg.c:3993
+#: g10/gpg.c:3956
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika düzeyi geçersiz; 1, 2 veya 3 olmalı\n"
 
-#: g10/gpg.c:3997
+#: g10/gpg.c:3960
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Not: Basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:4001
+#: g10/gpg.c:3964
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "geçersiz S2K kipi; 0, 1 veya 3 olmalı\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "geçersiz öntanımlı tercihler\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "geçersiz kişisel şifre tercihleri\n"
 
-#: g10/gpg.c:4015
-#, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr "geçersiz kişisel AEAD tercihler\n"
-
-#: g10/gpg.c:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "geçersiz kişisel özet tercihleri\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "geçersiz kişisel sıkıştırma tercihleri\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "parça boyutu geçersiz - %d kullanılıyor\n"
 
-#: g10/gpg.c:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:4137
-#, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "'%s' AEAD algoritması, %s kipinde kullanılamayabilir\n"
-
-#: g10/gpg.c:4149
+#: g10/gpg.c:4097
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "'%s' sıkıştırma algoritması, %s kipinde kullanılamayabilir\n"
 
-#: g10/gpg.c:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB ilklendirilemedi: %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "UYARI: Alıcılar (-r), genel anahtar şifrelemesi kullanılmadan verilmiştir\n"
 
-#: g10/gpg.c:4388
+#: g10/gpg.c:4336
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "'%s' ögesinin simetrik şifrelemesi başarısız: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:4420
+#: g10/gpg.c:4368
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "%s kipinde --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4426
 #, 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:4481
+#: g10/gpg.c:4429
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "%s kipinde --symmetric --sign --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "anahtar sunucusuna gönderim başarısız: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "anahtar sunucusundan alım başarısız: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar dışa aktarımı başarısız: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "ssh anahtarı olarak dışa aktarma başarısız: %s\n"
 
-#: g10/gpg.c:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "geçersiz sağlama algoritması '%s'\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "'%s' anahtar belirtimi ayrıştırılırken hata: %s\n"
 
-#: g10/gpg.c:5310
+#: g10/gpg.c:5266
 #, 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:5366
+#: g10/gpg.c:5322
 #, 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:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence URL'si geçersiz\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence URL'si geçersiz\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu URL'si geçersiz\n"
@@ -3385,7 +3395,7 @@ msgstr "|FILE|anahtarlar FILE anahtar zincirinden al"
 msgid "make timestamp conflicts only a warning"
 msgstr "zaman damgası çelişkilerini uyarı olarak bildir"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yaz"
 
@@ -3414,153 +3424,153 @@ msgstr "Yardım mevcut değil"
 msgid "No help available for '%s'"
 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 "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 "içe aktarım sırasında pks anahtar sunucusundaki bozukluğu onar"
 
-#: g10/import.c:175
+#: g10/import.c:176
 msgid "do not clear the ownertrust values during import"
 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 "içe aktarım sonrasında trustdb'yi güncelleme"
 
-#: g10/import.c:181
+#: g10/import.c:182
 msgid "enable bulk import mode"
 msgstr "toptan içe aktarım kipini etkinleştir"
 
-#: g10/import.c:184
+#: g10/import.c:185
 msgid "show key during import"
 msgstr "içe aktarım sırasında anahtarı göster"
 
-#: g10/import.c:187
+#: g10/import.c:188
 msgid "show key but do not actually import"
 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 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 "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 "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 "ö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 "içe aktarma süzgeçlerini çalıştır ve anahtarı hemen dışa aktar"
 
-#: g10/import.c:205
+#: g10/import.c:206
 msgid "assume the GnuPG key backup format"
 msgstr "GnuPG anahtar yedekleme biçimini varsay"
 
-#: g10/import.c:209
+#: g10/import.c:210
 msgid "repair keys on import"
 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 "İşlenen toplam sayı: %lu\n"
 
-#: g10/import.c:842
+#: g10/import.c:843
 #, c-format
 msgid "    skipped PGP-2 keys: %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 "        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"
 
-#: g10/import.c:850 sm/import.c:129
+#: g10/import.c:851 sm/import.c:129
 #, c-format
 msgid "              imported: %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ÅŸ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"
 
-#: g10/import.c:858
+#: g10/import.c:859
 #, c-format
 msgid "           new subkeys: %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"
 
-#: g10/import.c:862
+#: g10/import.c:863
 #, c-format
 msgid "   new key revocations: %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 "        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 " 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 "    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 "            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"
 
-#: g10/import.c:874
+#: g10/import.c:875
 #, c-format
 msgid "      user IDs cleaned: %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"
@@ -3569,173 +3579,173 @@ msgstr ""
 "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\": %s şifreleme algoritması tercih edilir\n"
 
-#: g10/import.c:1359
+#: g10/import.c:1360
 #, c-format
 msgid "         \"%s\": preference for AEAD algorithm %s\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\": %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 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ı 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 güncellemek için: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1940 g10/import.c:3077
+#: g10/import.c:1998 g10/import.c:3146
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "%s anahtarı: Kullanıcı kimliği yok\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, c-format
 msgid "key %s: %s\n"
 msgstr "%s anahtarı: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr "içe aktarma tarayıcısı tarafından reddedildi"
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "%s anahtarı: PKS yardımcı anahtar bozulması onarıldı\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2075
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\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:2086 g10/import.c:2117
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "%s anahtarı: Geçerli kullanıcı kimliği yok\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2088
 #, c-format
 msgid "this may be caused by a missing self-signature\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:2167 g10/import.c:3533
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "%s anahtarı: Genel anahtar bulunamadı: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2173
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "%s anahtarı: Yeni anahtar - atlandı\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri bulunamadı: %s\n"
 
-#: g10/import.c:2159 g10/import.c:2261 g10/import.c:3538
+#: g10/import.c:2217 g10/import.c:2319 g10/import.c:3608
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "'%s' anahtarlığı yazılırken hata: %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2240
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "%s anahtarı: Genel anahtar \"%s\" içe aktarıldı\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2267
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "%s anahtarı: Bizim kopyamızla eşleşmiyor\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2335
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "%s anahtarı: \"%s\" 1 yeni kullanıcı kimliği\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2338
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "%s anahtarı: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2341
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "%s anahtarı: \"%s\" 1 yeni imza\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2344
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "%s anahtarı: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2347
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "%s anahtarı: %s 1 yeni yardımcı anahtar\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "%s anahtarı: \"%s\" %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "%s anahtarı: \"%s\" %d imza temizlendi\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "%s anahtarı: \"%s\" %d imza temizlendi\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "%s anahtarı: \"%s\" %d kullanıcı kimliği temizlendi\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "%s anahtarı: \"%s\" %d kullanıcı kimliği temizlendi\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2398
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "%s anahtarı: \"%s\" değiştirilmedi\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2785 g10/import.c:2980
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "%s anahtarı: Gizli anahtar alındı\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "%s anahtarı: Gizli anahtar halihazırda var\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2801
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "%s anahtarı: Aracıya gönderirken hata: %s\n"
@@ -3748,209 +3758,209 @@ msgstr "%s anahtarı: Aracıya gönderirken hata: %s\n"
 #. * 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:2970
 #, 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
+#: g10/import.c:3117
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "gizli anahtar %s: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3138 g10/import.c:3177
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "gizli anahtarların içe aktarımına izin verilmez\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3165
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\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:3327 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:3328 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:3329 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:3330 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:3331 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:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 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:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 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:3526
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "%s anahtarı: Genel anahtar değil - yürürlükten kaldırma sertifikası "
 "uygulanamaz\n"
 
-#: g10/import.c:3485
+#: g10/import.c:3555
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%s anahtarı: Özgün anahtar bloku bulunamadı: %s\n"
 
-#: g10/import.c:3492
+#: g10/import.c:3562
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%s anahtarı: Özgün anahtar bloku okunamadı: %s\n"
 
-#: g10/import.c:3512
+#: g10/import.c:3582
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "%s anahtarı: Yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "%s anahtarı: \"%s\" yürürlükten kaldırma sertifikası içe aktarıldı\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3703
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "%s anahtarı: İmza için kullanıcı kimliği yok\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3720
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "%s anahtarı: Kullanıcı kimliği \"%s\" üzerinde desteklenmeyen genel anahtar "
 "algoritması\n"
 
-#: g10/import.c:3652
+#: g10/import.c:3722
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\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:3739 g10/import.c:3767 g10/import.c:3823
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "%s anahtarı: Desteklenmeyen genel anahtar algoritması\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "%s anahtarı: Geçersiz doğrudan anahtar imzası\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "%s anahtarı: Anahtarı garantilemek için yardımcı anahtar yok\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3769
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "%s anahtarı: Yardımcı anahtar garantilemesi geçersiz\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3788
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "%s anahtarı: Çok sayıda yardımcı anahtar bağlantısı kaldırıldı\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3812
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "%s anahtarı: Anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%s anahtarı: Yardımcı anahtar yürürlükten kaldırması geçersiz\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3840
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 "%s anahtarı: Çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3887
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%s anahtarı: Kullanıcı kimliği \"%s\" atlandı\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%s anahtarı: Yardımcı anahtar atlandı\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "%s anahtarı: İmza gönderilebilir değil (0x%02X sınıfı) - atlandı\n"
 
-#: g10/import.c:3884
+#: g10/import.c:3957
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "%s anahtarı: Yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:3902
+#: g10/import.c:3985
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "%s anahtarı: Yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4009
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "%s anahtarı: Yardımcı anahtar imzası yanlış yerde - atlandı\n"
 
-#: g10/import.c:3924
+#: g10/import.c:4017
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "%s anahtarı: Umulmadık imza sınıfı (0x%02X) - atlandı\n"
 
-#: g10/import.c:4097
+#: g10/import.c:4190
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "%s anahtarı: Çift kullanıcı kimliği saptandı - birleştirildi\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4297
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "%s anahtarı: Çift kullanıcı kimliği saptandı - birleştirildi\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4362
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "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:4378
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "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:4444
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "%s anahtarı: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4482
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%s anahtarı: Doğrudan anahtar imzası eklendi\n"
@@ -3989,14 +3999,14 @@ msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "%d yinelenen imza kaldırıldı\n"
 msgstr[1] "%d yinelenen imza kaldırıldı\n"
 
-#: g10/key-check.c:726 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"
 msgstr[0] "%d imza kayıp bir anahtar yüzünden denetlenemedi\n"
 msgstr[1] "%d imza kayıp bir anahtar yüzünden denetlenemedi\n"
 
-#: g10/key-check.c:734 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"
@@ -4049,15 +4059,15 @@ msgstr "anahtar bloku özkaynağı: '%s': %s\n"
 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:262
 msgid "[revocation]"
 msgstr "[yürürlükten kaldırma]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[öz imza]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4068,17 +4078,17 @@ msgstr ""
 "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:389 g10/pkclist.c:289
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = Şöyle böyle güveniyorum\n"
 
-#: g10/keyedit.c:389 g10/pkclist.c:291
+#: g10/keyedit.c:390 g10/pkclist.c:291
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = Tümüyle güveniyorum\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:408
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4088,50 +4098,50 @@ msgstr ""
 "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:425
 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'a basın.\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr "Bir metin kimliği olmayan \"%s\" kullanıcı kımlığı atlanıyor.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 msgid "Are you sure you still want to sign it? (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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Kullanıcı kimliği \"%s\" süresi geçti."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Kullanıcı kimliği \"%s\" öz imzalı değil."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Kullanıcı kimliği \"%s\" imzalanabilir.  "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr "İmzalansın mı? (e/H) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4140,11 +4150,11 @@ msgstr ""
 "\"%s\" üzerindeki öz imza\n"
 "PGP 2.x tarzı bir imza.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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) "
 
-#: g10/keyedit.c:696
+#: g10/keyedit.c:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4153,13 +4163,13 @@ msgstr ""
 "\"%s\" üzerindeki imzanızın\n"
 "kullanım süresi dolmuş.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 msgid "Do you want to issue a new signature to replace the expired one? (y/N) "
 msgstr ""
 "Süresi geçen imzayı yenilemek için yeni bir imza oluşturmak ister misiniz? "
 "(e/H) "
 
-#: g10/keyedit.c:722
+#: g10/keyedit.c:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4168,45 +4178,45 @@ msgstr ""
 "\"%s\" üzerindeki imzanız\n"
 "yerel bir imza.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Bu imzanın tam bir dışa aktarılabilir imza haline getirilmesini istiyor "
 "musunuz? (e/H) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:748
 #, 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:752
 #, 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:758
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Onu yine de yeniden imzalamak istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 #, 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:804
 msgid "This key has expired!"
 msgstr "Bu anahtarın kullanım süresi dolmuş!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s tarihinde bitiyor.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 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ı istiyor musunuz? (E/h) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4215,31 +4225,31 @@ msgstr ""
 "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:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) Yanıtlamayacağım.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Hiçbir denetim yapmadım.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Öylesine bir baktım.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:881
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Çok dikkatlice denetledim.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:888
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Seçiminiz? (daha fazla bilgi için: '?'): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4249,235 +4259,235 @@ msgstr ""
 "gerçekten\n"
 "emin misiniz?\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 msgid "This will be a self-signature.\n"
 msgstr "Bu bir öz imza olacak.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "UYARI: Bu imza dışa aktarılamayan bir imza olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "UYARI: İmza yürürlükten kaldırılamaz olarak imlenmeyecek.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:945
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "İmza dışa aktarılamaz olarak imlenecek.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:952
 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:959
 msgid "I have not checked this key at all.\n"
 msgstr "Bu anahtarı hiç denetlemedim.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 msgid "I have checked this key casually.\n"
 msgstr "Bu anahtarı öylesine denetledim.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 msgid "I have checked this key very carefully.\n"
 msgstr "Bu anahtarı çok dikkatlice denetledim.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:981
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalansın mı? (e/H) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "Anahtar yalnızca kısa veya karta özel öğeler içeriyor, değiştirilecek bir "
 "anahtar parolası yok.\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1152
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "%s anahtarı: Anahtar parolası değiştirilirken hata: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 msgid "show key fingerprint"
 msgstr "anahtar parmak izini göster"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "show the keygrip"
 msgstr "anahtar yakalamayı göster"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "anahtar ve kullanıcı kimliğini listele"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seç"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr "N yardımcı anahtarını seç"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr "imzaları denetle"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "seçilen kullanıcı kimliğini imzala [* ilgili komutlar için aşağı bakın]"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "sign selected user IDs locally"
 msgstr "kullanıcı kimliklerini yerel olarak imzala"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 msgid "sign selected user IDs with a trust signature"
 msgstr "seçili kullanıcı kimliklerini bir güvence imzasıyla imzala"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "seçili kullanıcı kimliklerini yürürlükten kaldırılamayan bir imzayla imzala"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekle"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "bir fotoÄŸraf kimliÄŸi ekle"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr "seçili kullanıcı kimliklerini sil"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr "bir yardımcı anahtar ekle"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr "bir akıllı karta bir anahtar ekle"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr "bir akıllı karttan bir anahtarı taşı"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr "bir anahtarı yerel TPM kullanarak TPM biçimine dönüştür"
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr "bir akıllı karttan bir yedekleme anahtarını taşı"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 msgid "delete selected subkeys"
 msgstr "seçili yardımcı anahtarları sil"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "bir yürürlükten kaldırma anahtarı ekle"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 msgid "delete signatures from the selected user IDs"
 msgstr "seçili kullanıcı kimliklerinden imzaları sile"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1314
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 "anahtar veya seçili yardımcı anahtarlar için zaman aşımı tarihini değiştir"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1316
 msgid "flag the selected user ID as primary"
 msgstr "seçili kullanıcı kimliğini asıl olarak imle"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "tercihleri listele (uzman)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "tercihleri listele (ayrıntılı)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 msgid "set preference list for the selected user IDs"
 msgstr "seçili kullanıcı kimlikleri için tercih listesini ayarla"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1325
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "seçili kullanıcı kimlikleri için tercih edilen anahtar sunucusunu ayarla"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1327
 msgid "set a notation for the selected user IDs"
 msgstr "seçili kullanıcı kimlikleri için bir simgelem belirle"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1329
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştir"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "iye güvencesini değiştir"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 msgid "revoke signatures on the selected user IDs"
 msgstr "Seçili tüm kullanıcı kimliklerindeki imzaları yürürlükten kaldır"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 msgid "revoke selected user IDs"
 msgstr "Seçili tüm kullanıcı kimliklerini yürürlükten kaldır"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "revoke key or selected subkeys"
 msgstr "anahtarı veya seçili yardımcı anahtarları yürürlükten kaldır"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "enable key"
 msgstr "anahtarı etkinleştir"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr "anahtarı devre dışı bırak"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr "seçili fotoğraf kimliklerini göster"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "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:1349
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "kullanışsız kullanıcı kimliklerini sıkıştır ve tüm imzaları anahtardan kaldır"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1470
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 msgid "Secret subkeys are available.\n"
 msgstr "Gizli yardımcı anahtarlar mevcut.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1574
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4488,293 +4498,277 @@ msgstr ""
 "'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:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Tüm metin kullanıcı kimlikleri gerçekten imzalansın mi? (e/H) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1682
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tüm kullanıcı kimlikleri gerçekten imzalansın mı? (e/H) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1690
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçin\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1701
 #, c-format
 msgid "Unknown signature type '%s'\n"
 msgstr "Bilinmeyen imza türü '%s'\n"
 
-#: g10/keyedit.c:1746 g10/keyedit.c:1770 g10/keyedit.c:2008
+#: g10/keyedit.c:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "('%s' komutunu kullanın.)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 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:1755
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Seçilen tüm kullanıcı kimlikleri gerçekten silinsin mi? (e/H) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 msgid "Really remove this user ID? (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:1814 g10/keyedit.c:1854
 msgid "Really move the primary key? (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:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 msgid "You must select exactly one key.\n"
 msgstr "Yalnızca ve yalnızca bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 msgid "Command expects a filename argument\n"
 msgstr "Komut, argüman olarak bir dosya adı bekliyor\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "'%s' açılamıyor: %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Yedekleme anahtarı '%s' konumundan okunurken hata: %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1969
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1975
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2015
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "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:2016
 msgid "Really revoke this user ID? (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:2034
 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) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2045
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 "Seçili yardımcı anahtarları yürürlükten kaldırmayı gerçekten istiyor "
 "musunuz? (e/H) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2047
 msgid "Do you really want to revoke this subkey? (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:2105
 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 iye "
 "güvencesi belirlenemez\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2150
 msgid "Set preference list to:\n"
 msgstr "Belirlenecek tercih listesi:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Seçili kullanıcı kimlikleri için tercihleri gerçekten güncellemek istiyor "
 "musunuz? (e/H) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2159
 msgid "Really update the preferences? (y/N) "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Save changes? (y/N) "
 msgstr "DeÄŸiÅŸiklikler kaydedilsin mi? (e/H) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr "Kaydetmeden çıkılsın mı? (e/H) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Anahtar değişmediğinden güncellemeye gerek yok.\n"
 
-#: g10/keyedit.c:2557
+#: g10/keyedit.c:2558
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "Son geçerli kullanıcı kimliğini yürürlükten kaldıramazsınız.\n"
 
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2584
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "kullanıcı kimliğinin yürürlükten kaldırılması başarısız: %s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "asıl kullanıcı kimliğini ayarlama başarısız: %s\n"
 
-#: g10/keyedit.c:2677
+#: g10/keyedit.c:2717
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\", bir parmak izi deÄŸil\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\", asıl parmak izi değil\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Geçersiz kullanıcı kimliği '%s': %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "No matching user IDs."
 msgstr "Eşleşen kullanıcı kimliği yok."
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "Nothing to sign.\n"
 msgstr "Ä°mzalanacak bir ÅŸey yok.\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Sizin tarafınızdan imzalanmamış.\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "anahtar imzasını yürürlükten kaldırma başarısız: %s\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3251
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s', geçerli bir son kullanma tarihi değil\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\", düzgün bir parmak izi değil\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "yardımcı anahtar \"%s\" bulunamadı\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr "AEAD: "
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Özet: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Özellikler: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr "Anahtar sunucusu deÄŸiÅŸmez"
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "Tercih edilen anahtar sunucusu: "
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr "Simgelemler: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 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:3843
+#: g10/keyedit.c:3735
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr ""
 "Aşağıdaki anahtar %s tarihinde %s tarafından yürürlükten kaldırıldı, anahtar "
 "%s\n"
 
-#: g10/keyedit.c:3867
+#: g10/keyedit.c:3759
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Bu anahtar %s tarafından yürürlükten kaldırılmış olabilir, anahtar %s"
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr "(duyarlı)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "oluÅŸturuldu: %s"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr "kullanım: %s"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr "kart numarası: "
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr "güvencesi: %s"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr "geçerliliği: %s"
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmiÅŸ"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4782,17 +4776,17 @@ 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"
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "zaman aşımına uğradı"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4801,17 +4795,17 @@ msgstr ""
 "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:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "UYARI: Şifreleme yardımcı anahtarının yakın zamanda süresi dolacak.\n"
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Son kullanma tarihini de deÄŸiÅŸtirmek isteyebilirsiniz.\n"
 
-#: g10/keyedit.c:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4821,72 +4815,72 @@ msgstr ""
 "anahtarın\n"
 "         bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H) "
 
-#: g10/keyedit.c:4324
+#: g10/keyedit.c:4216
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2 tarzı bir anahtara bir fotoğraf kimliği ekleyemezsiniz.\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4231
 msgid "Such a user ID already exists on this key!"
 msgstr "Böyle bir kullanıcı kimliği bu anahtarda halihazırda var!"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doÄŸru imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz imza gerçekten silinsin mi? (e/H)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d imza silindi.\n"
 msgstr[1] "%d imza silindi.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "geçersiz"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Kullanıcı kimliği \"%s\" kompaktlaştırıldı: %s\n"
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
 msgstr[1] "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kullanıcı kimliği \"%s\": Zaten küçültülmüş\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kullanıcı kimliği \"%s\": Zaten temiz\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4896,50 +4890,50 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 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:4631
+#: g10/keyedit.c:4523
 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:4657
+#: g10/keyedit.c:4549
 #, 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:4673
+#: g10/keyedit.c:4565
 #, 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:4695
+#: g10/keyedit.c:4587
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "bu anahtar zaten bir yürürlükten kaldırıcı olarak belirlenmiş\n"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4605
 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 "
 "kullanılamaz!\n"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4611
 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ğinize emin "
 "misiniz? (e/H) "
 
-#: g10/keyedit.c:4788
+#: g10/keyedit.c:4680
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -4947,173 +4941,173 @@ msgstr ""
 "Birden çok yardımcı anahtarın son kullanım süresini değiştirmek istediğinize "
 "emin misiniz? (e/H) "
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 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:4796
+#: g10/keyedit.c:4688
 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:4852
+#: g10/keyedit.c:4744
 #, 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:4912
+#: g10/keyedit.c:4804
 msgid "Changing usage of a subkey.\n"
 msgstr "Bir yardımcı anahtarın kullanımı değiştiriliyor.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 msgid "Changing usage of the primary key.\n"
 msgstr "Asıl anahtarın kullanımı değiştiriliyor.\n"
 
-#: g10/keyedit.c:5033
+#: g10/keyedit.c:4925
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "yardımcı imzalama anahtarı %s zaten çapraz sertifikalı\n"
 
-#: g10/keyedit.c:5039
+#: g10/keyedit.c:4931
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "%s yardımcı anahtarı imzalamıyor, dolayısıyla çapraz sertifikalı olması "
 "gerekmiyor\n"
 
-#: g10/keyedit.c:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen yalnızca ve yalnızca bir kullanıcı kimliği seçin.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "kullanıcı kimliği \"%s\" için v3 öz imzası atlanıyor\n"
 
-#: g10/keyedit.c:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiÄŸiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Onu başkasıyla değiştirmek istediğinize emin misiniz? (e/H) "
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Onu silmek istediÄŸinize emin misiniz? (e/H) "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 msgid "Enter the notation: "
 msgstr "Simgelemi giriniz: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 msgid "Proceed? (y/N) "
 msgstr "Sürdür? (e/H) "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine iye kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%s sağlamalı kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "'%s' anahtar kimlikli bir yardımcı anahtar yok.\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indeksli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s anahtarınızla %s%s%s üzerinde imzalandı\n"
 
-#: g10/keyedit.c:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (dışa aktarılamaz)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s tarihinde bitti.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 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) "
 
-#: g10/keyedit.c:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Bu imza için bir yürürlükten kaldırma sertifikası üretilsin mi? (e/H) "
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, 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:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr " (yürürlükten kaldırılamaz)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, 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:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Yürürlükten kaldırma sertifikaları gerçekten üretilsin mi? (e/H) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "kullanıcı olmayan bir kimlik yürürlükten kaldırılmaya çalışıldı: %s\n"
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten yürürlükten kaldırılmıştı\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "UYARI: Bir kullanıcı kimliği imzası %d saniye gelecekte oluşturuldu\n"
 
-#: g10/keyedit.c:6426
+#: g10/keyedit.c:6320
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Son geçerli kullanıcı kimliğini yürürlükten kaldıramazsınız.\n"
 
-#: g10/keyedit.c:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "%s anahtarı zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "%s yardımcı anahtarı zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5154,33 +5148,33 @@ msgstr "çok fazla AEAD tercihi\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "tercih dizisindeki '%s' öğesi geçersiz\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "doğrudan imza yazılıyor\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "öz imza yazılıyor\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5188,19 +5182,19 @@ msgstr ""
 "UYARI: Bazı OpenPGP uygulamaları bu özet boyutlu bir DSA anahtarıyla "
 "çalışamayabilir\n"
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr "Ä°mzala"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr "Onayla"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr "Åžifrele"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr "Kimlik doÄŸrula"
 
@@ -5214,166 +5208,166 @@ msgstr "Kimlik doÄŸrula"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr "MmFfDdKk"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "bu %s anahtarı için olası eylemler: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr "Åžu anda izin verilen eylemler: "
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) İmzalama yeteneğini aç/kapat\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) Şifreleme yeteneğini aç/kapat\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) Kimlik doğrulama yeteneğini aç/kapat\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Bitti\n"
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA ve RSA%s\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA ve ElGamal%s\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, c-format
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (yalnızca imzalama)%s\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2113
 #, c-format
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (yalnızca imzalama)%s\n"
 
-#: g10/keygen.c:2142
+#: g10/keygen.c:2119
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal (yalnızca şifreleme)%s\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, c-format
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (yalnızca şifreleme)%s\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2127
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA (kendi yeteneklerinizi ayarlayın)%s)\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA (kendi yeteneklerinizi ayarlayın)%s\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ECC (imza ve ÅŸifreleme)%s\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 msgid " *default*"
 msgstr " *öntanımlı*"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) DSA (yalnızca imzalama)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) DSA (kendi yeteneklerinizi belirtin)%s\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, c-format
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) RSA (yalnızca şifreleme)%s\n"
 
-#: g10/keygen.c:2167
+#: g10/keygen.c:2144
 #, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) Var olan anahtar%s\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr "  (%d) Karttaki var olan anahtar%s\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Anahtar maşasını girin: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 sm/certreqgen-ui.c:211 tools/gpg-card.c:2315
 #, c-format
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "Geçerli bir anahtar maşası değil (40 onaltılık basamak bekleniyor)\n"
 
-#: g10/keygen.c:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "Bu anahtar maşasında bir anahtar yok\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: sm/certreqgen-ui.c:231 sm/certreqgen-ui.c:240
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "kart okunurken hata: %s\n"
 
-#: g10/keygen.c:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Kartın seri numarası: %s\n"
 
-#: g10/keygen.c:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "Kullanılabilir anahtarlar:\n"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:2570
+#: g10/keygen.c:2547
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s anahtarları %u bit ile %u bit arasında olmalı.\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2555
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Yardımcı anahtar için istediğiniz anahtar boyutu nedir? (%u) "
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Ä°stenen anahtar boyutu: %u bit\n"
 
-#: g10/keygen.c:2641
+#: g10/keygen.c:2618
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Lütfen hangi eliptik eğriyi istediğinizi seçin:\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5389,7 +5383,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5405,38 +5399,38 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar süre için geçerli olsun? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "İmza ne kadar süre için geçerli olsun? (%s) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "geçersiz değer\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr "Anahtar hep geçerli olacak\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr "İmza hep geçerli olacak\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Anahtarın geçerliliği %s tarihinde bitecek\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "İmzanın geçerliliği %s tarihinde bitecek\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5444,11 +5438,11 @@ msgstr ""
 "Sisteminiz 2038 yılından sonraki tarihleri gösteremiyor.\n"
 "Ancak 2106 yılına kadar düzgünce çalışacak.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr "Bu doÄŸru mu? (e/H) "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5462,7 +5456,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5478,41 +5472,41 @@ msgstr ""
 "    \"Kül Tigin (Eş Kağan) <kueltigin@goektueruek.gk>\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Gerçek adınız: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "Adda geçersiz karakter\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "'%s' ve '%s' karakterleri adınızda görünemez\n"
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "Geçerli bir e-posta adresi değil\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "'%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5523,11 +5517,11 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Lütfen e-posta adresinizi gerçek ad veya önbilgi alanına koymayın\n"
 
-#: g10/keygen.c:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr "Böyle bir kullanıcı kimliği bu anahtarda halihazırda var!\n"
 
@@ -5542,31 +5536,31 @@ msgstr "Böyle bir kullanıcı kimliği bu anahtarda halihazırda var!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "AaNnEeTtKk"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "(A)d, Ö(n)bilgi, (E)-posta değiştir veya Çı(k)? "
 
-#: g10/keygen.c:3142
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "(A)d, Ö(n)bilgi, (E)-posta değiştir veya (T)amam/Çı(k)? "
 
-#: g10/keygen.c:3147
+#: g10/keygen.c:3124
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "(A)d, Ö(n)bilgi, (E)-posta değiştir veya Çı(k)? "
 
-#: g10/keygen.c:3148
+#: g10/keygen.c:3125
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "(A)d, Ö(n)bilgi, (E)-posta değiştir veya (T)amam/Çı(k)? "
 
-#: g10/keygen.c:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5578,18 +5572,18 @@ msgstr ""
 "iyi olacaktır; bu yeterli rastgele bayt kazanımı için rastgele sayı\n"
 "üretecine yardımcı olur.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr "UYARI: v4 tanımlı; ancak v5 tarafından geçersiz kılındı.\n"
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısız: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5600,66 +5594,66 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr "Sürdürülsün mü? (E/h) "
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "\"%s\" için bir anahtar halihazırda mevcut\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 msgid "Create anyway? (y/N) "
 msgstr "Yine de üretilsin mi? (e/H) "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, c-format
 msgid "creating anyway\n"
 msgstr "yine de üretiliyor\n"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, 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:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi iptal edildi.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "Not: Kart anahtar yedeÄŸi '%s' konumuna kaydedildi\n"
 
-#: g10/keygen.c:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "genel anahtar '%s' konumuna yazılıyor\n"
 
-#: g10/keygen.c:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "'%s' genel anahtar zinciri yazılırken hata: %s\n"
 
-#: g10/keygen.c:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 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"
@@ -5667,37 +5661,37 @@ msgstr ""
 "Bu anahtar şifreleme için kullanılamaz. Şifreleme için yardımcı anahtarı\n"
 "\"--edit-key\" seçeneğini kullanarak üretebilirsiniz.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %lu saniye gelecekte üretilmiş (zaman sapması veya saat sorunu)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "anahtar %lu saniye gelecekte üretilmiş (zaman sapması veya saat sorunu)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "Not: v3 anahtarları için yardımcı anahtar üretimi OpenPGP uyumlu değildir\n"
 
-#: g10/keygen.c:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, 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:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, 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:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr "Gerçekten üretilsin mi? (e/H) "
 
@@ -5705,74 +5699,90 @@ msgstr "Gerçekten üretilsin mi? (e/H) "
 msgid "never     "
 msgstr "asla      "
 
-#: g10/keylist.c:350
+#: g10/keylist.c:415
+msgid "AEAD: "
+msgstr "AEAD: "
+
+#: 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 "İ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 "Ä°mza simgelemi: "
 
-#: g10/keylist.c:495
+#: g10/keylist.c:717
 #, c-format
 msgid "%d good signature\n"
 msgid_plural "%d good signatures\n"
 msgstr[0] "%d kötü imza\n"
 msgstr[1] "%d kötü imza\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"
 msgstr[0] "%d imza, bir hata yüzünden denetlenmedi\n"
 msgstr[1] "%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"
 msgstr[0] "Uyarı: %lu imza, büyük boyut nedeniyle atlandı\n"
 msgstr[1] "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:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "    Asıl anahtar parmak izi:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr "    Asıl anahtar parmak izi:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "Yardımcı anahtar parmak izi:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr "   Anahtar parmak izi ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr "   Kart seri numarası ="
 
@@ -6142,7 +6152,7 @@ msgstr "ikili"
 msgid "textmode"
 msgstr "metin kipi"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "bilinmeyen"
 
@@ -6277,28 +6287,28 @@ msgstr "Sıkıştırılmamış"
 msgid "uncompressed|none"
 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
+#: g10/misc.c:1614
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "belirsiz seçenek '%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "bilinmeyen seçenek '%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, c-format
 msgid "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr ""
 "ECDSA genel anahtarının SEC kodlamasında 8'in katları olması bekleniyor\n"
 
-#: g10/misc.c:1910
+#: g10/misc.c:1899
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "bilinmeyen zayıf özet '%s'\n"
@@ -6419,7 +6429,7 @@ msgstr ""
 "%s%s tarihinde oluÅŸturuldu.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6433,70 +6443,70 @@ msgstr ""
 "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:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Fotoğraf kimliği için JPEG dosya adını girin: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "JPEG dosyası '%s' açılamıyor: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:239
 #, 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:241
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Onu kullanmak istediÄŸinize emin misiniz? (e/H) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:257
 #, 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:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Bu fotoÄŸraf doÄŸru mu? (e/H/k) "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, 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:593
 #, 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
+#: g10/photoid.c:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "dış uygulamamnın doğal olmayan çıkışı\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, 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
+#: g10/photoid.c:707
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "UYARI: Geçici dosya silinemiyor (%s) '%s': %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:711
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "UYARI: '%s' geçici dizini silinemiyor: %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6504,7 +6514,7 @@ msgstr ""
 "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:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "fotoğraf kimliği görüntülenemiyor!\n"
@@ -6822,12 +6832,12 @@ msgstr "bilinmeyen öntanımlı alıcı \"%s\"\n"
 msgid "no valid addressees\n"
 msgstr "geçerli adres yok\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Not: %s anahtarı, %s özelliğine iye değil\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Not: %s anahtarı, %s için bir tercihe iye değil\n"
@@ -7887,7 +7897,7 @@ msgstr "%s güvence modeli kullanılıyor\n"
 msgid "no need for a trustdb check\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 tarihinde\n"
@@ -7917,31 +7927,31 @@ msgstr "lütfen bir --check-trustdb yapın\n"
 msgid "checking the trustdb\n"
 msgstr "güvence veritabanı denetleniyor\n"
 
-#: g10/trustdb.c:2085
+#: g10/trustdb.c:2097
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "%d anahtar iÅŸlendi"
 msgstr[1] "%d anahtar iÅŸlendi"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " (%d doğrulama sayımı temizlendi)\n"
 msgstr[1] " (%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 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 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"
@@ -7949,7 +7959,7 @@ msgstr ""
 "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 "trustdb sürüm kaydı güncellenemedi: Yazma başarısız: %s\n"
@@ -8072,7 +8082,7 @@ msgstr ""
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8080,7 +8090,7 @@ msgstr "%sSayı: %s%%0Aİyesi: %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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8110,7 +8120,7 @@ msgstr "|N|Lütfen yeni blok açma anahtarını girin"
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "||Lütfen PIV kartınızın blok açma anahtarını girin"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8195,57 +8205,57 @@ msgstr[1] "anahtar üretimi tamamlandı (%d saniye)\n"
 msgid "response does not contain the public key data\n"
 msgstr "yanıt genel anahtar verisini içermiyor\n"
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Lütfen yönetici PIN'ini girin"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 scd/app-nks.c:2098
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Lütfen standart anahtarlar için PIN blok açma kilidini (PUK) girin."
 
-#: scd/app-p15.c:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Lütfen standart anahtarlar için PIN'i girin."
 
-#: scd/app-nks.c:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, 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:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, 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:1654
+#: scd/app-nks.c:1656
 msgid "Note: PIN has not yet been enabled."
 msgstr "Not: PIN henüz etkinleştirilmedi."
 
-#: scd/app-nks.c:1701
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "Boş PIN henüz değiştirilmedi\n"
 
-#: scd/app-nks.c:2074
+#: scd/app-nks.c:2088
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Lütfen standart anahtarlar için yeni bir PIN girin."
 
-#: scd/app-nks.c:2082
+#: scd/app-nks.c:2096
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|NP|Lütfen standart anahtarlar için yeni bir PIN blok açma (PUK) kodu girin."
 
-#: scd/app-nks.c:2092
+#: scd/app-nks.c:2106
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|Nitelikli imzalar üretmek için lütfen yeni bir PIN girin."
 
-#: scd/app-nks.c:2102
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8253,14 +8263,14 @@ msgstr ""
 "|NP|Nitelikli imzalar üretmek için lütfen yeni bir PIN blok açma kodu (PUK) "
 "girin."
 
-#: scd/app-nks.c:2104
+#: 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:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "yeni PIN alınırken hata: %s\n"
@@ -8518,13 +8528,13 @@ msgstr "fd %d için eylemci başlatıldı\n"
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d için eylemci sonlandı\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 "Tor kullanımda olabilir - ağ erişimi sınırlı"
 
@@ -8533,11 +8543,11 @@ msgstr "Tor kullanımda olabilir - ağ erişimi sınırlı"
 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:199 sm/certchain.c:2211
 msgid "chain"
 msgstr "zincir"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 msgid "shell"
 msgstr "kabuk"
 
@@ -8560,235 +8570,235 @@ msgstr "yapılandırılmış poliçeler olmaksızın kritik imli poliçe"
 msgid "failed to open '%s': %s\n"
 msgstr "'%s' açılamadı: %s\n"
 
-#: sm/certchain.c:355 sm/certchain.c:384 dirmngr/validate.c:204
+#: sm/certchain.c:355 sm/certchain.c:385 dirmngr/validate.c:204
 #, c-format
 msgid "Note: non-critical certificate policy not allowed"
 msgstr "Not: Kritik olmayan sertifika poliçesine izin verilmez"
 
-#: sm/certchain.c:359 sm/certchain.c:388 dirmngr/validate.c:209
+#: sm/certchain.c:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "parmak izinin alınması başarısız oldu\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "vereni dış bir konumda arar\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "eşleşen veren sayısı: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "authorityInfoAccess alınamıyor: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:793
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "Dirmngr önbelleğinde vereni arar\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:818
 #, 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:821
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, 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:1260 sm/certchain.c:1264
 msgid "certificate has been revoked"
 msgstr "sertifika yürürlükten kaldırılmış"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr "sertifika durumu bilinmiyor"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, 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 olun\n"
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr "sertifika henüz geçersiz"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 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:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr "ara sertifika henüz geçersiz"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr "sertifika kullanım süresi dolmuş"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 msgid "root certificate has expired"
 msgstr "kök sertifikanın kullanım süresi dolmuş"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 msgid "intermediate certificate has expired"
 msgstr "ara sertifikanın kullanım süresi dolmuş"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, 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:1404
 msgid "certificate with invalid validity"
 msgstr "geçersiz doğrulukla sertifika"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 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:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr "verenin yaşam süresi boyunca sertifika oluşturulmadı"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "verenin yaşam süresi boyunca ara sertifika oluşturulmadı"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (           imzanın oluşturuluşu: "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (      sertifikanın oluşturuluşu: "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (sertifika geçerlilik başlangıcı: "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (    veren geçerlilik başlangıcı: "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "parmak izi=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, 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:1505
 #, 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:1511
 #, 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:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr ""
 "UYARI: İmzanın oluşturulma zamanı bilinmiyor - geçerli zaman varsayılıyor"
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 msgid "no issuer found in certificate"
 msgstr "sertifikada veren bilgisi bulunamadı"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 msgid "self-signed certificate has a BAD signature"
 msgstr "öz imzalı sertifika KÖTÜ bir imzaya iye"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1785 dirmngr/validate.c:576
 #, 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:1801
 #, 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:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, 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:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr "veren sertifikası bulunamadı"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "sertifika KÖTÜ bir imzaya iye"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1911 dirmngr/validate.c:693
 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:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr "sertifika iyi durumda\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "ara sertifika iyi durumda\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, c-format
 msgid "root certificate is good\n"
 msgstr "kök sertifika iyi durumda\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr "zincir modeline geçiliyor"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr "kullanılan geçerlilik modeli: %s"
@@ -8811,7 +8821,7 @@ msgstr "çekirdek dışında\n"
 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:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "yok"
 
@@ -8845,42 +8855,42 @@ msgstr ""
 "S/N: %s, Kimlik: 0x%08lX,\n"
 "oluşturulma: %s, süre bitimi: %s.\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "hiç anahtar kullanımı belirtilmemiş - tüm kullanımlar varsayılıyor\n"
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "sertifika, sertifikasyon için kullanılmamalıydı\n"
 
-#: sm/certlist.c:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "sertifika, OCSP yanıt imzalaması için kullanılmamalıydı\n"
 
-#: sm/certlist.c:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "sertifika, şifreleme için kullanılmamalıydı\n"
 
-#: sm/certlist.c:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "sertifika, imzalama için kullanılmamalıydı\n"
 
-#: sm/certlist.c:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "sertifika şifreleme için kullanılabilir değil\n"
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "sertifika imzalama için kullanılabilir değil\n"
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "başka bir sertifika aranıyor\n"
@@ -9432,7 +9442,7 @@ msgstr "%d imzalayıcısı için kullanılan sağlama algoritması: %s (%s)\n"
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "nitelikli sertifika için denetleme başarısız: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "%s/%s imza %s anahtarı kullanılarak %s\n"
@@ -9621,7 +9631,7 @@ msgstr "'%s' önbellek dosyası kaldırılıyor\n"
 msgid "not removing file '%s'\n"
 msgstr "'%s' dosyası kaldırılmıyor\n"
 
-#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2431
+#: dirmngr/crlcache.c:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "önbellek dosyası kapatılırken hata: %s\n"
@@ -9869,134 +9879,134 @@ msgstr "bilinmeyen sağlama algoritması '%s'\n"
 msgid "gcry_md_open for algorithm %d failed: %s\n"
 msgstr "%d algoritması için gcry_md_open başarısız:%s\n"
 
-#: dirmngr/crlcache.c:1848 dirmngr/ocsp.c:503
+#: dirmngr/crlcache.c:1849 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "sembolik ifade oluşturma başarısız: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1923
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse başarısız: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1938
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "CRL güncelleme zamanları alınırken hata: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1945
 #, c-format
 msgid "update times of this CRL: this=%s next=%s\n"
 msgstr "bu CRL'nin güncelleme zamanları: bu=%s sonraki=%s\n"
 
-#: dirmngr/crlcache.c:1948
+#: dirmngr/crlcache.c:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nextUpdate verilmedi; bir günlük geçerlilik süresi varsayılıyor\n"
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "CRL ögesi alınırken hata: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1984
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "geçici önbellek dosyasına öge eklenirken hata: %s\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2011
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "CRL içinde bir CRL vereni bulunamadı: %s\n"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "CRL vereni sertifikası authorityKeyIdentifier ile bulunuyor\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL imza doğrulaması başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2084
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "CRL vereni sertifikasının geçerliliği denetlenirken hata: %s\n"
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2226
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2233
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2267
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "eskimiş geçici önbellek dosyası '%s' kaldırıldı\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2271
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "eskimiş geçici önbellek dosyası '%s' kaldırılırken hata: %s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "geçici önbellek dosyası '%s' oluşturulurken hata: %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2291
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "geçici önbellek dosyası '%s' bitirilirken hata: %s\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2308
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "geçici önbellek dosyası '%s' kapatılırken hata: %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2333
 #, 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:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "yeni CRL hâlâ pek eski; %s tarihinde süresi dolmuş\n"
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "bilinmeyen kritik CRL uzantısı %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "CRL uzantısı okunurken hata: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2414
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "'%s' önbellek dosyası oluşturuluyor\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "'%s' > '%s' olarak yeniden adlandırırken sorun: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2460
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10005,12 +10015,12 @@ 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:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "CRL boşaltımını başlat (%s ile alındı)\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10018,54 +10028,54 @@ msgstr ""
 " HATA: CRL kullanılmayacak; çünkü bir güncelleme sonrasında bile hâlâ pek "
 "eski!\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2523
 msgid ""
 " ERROR: The CRL will not be used due to an unknown critical extension!\n"
 msgstr " HATA: CRL bilinmeyen bir kritik uzantıdan dolayı kullanılmayacak!\n"
 
-#: dirmngr/crlcache.c:2525
+#: dirmngr/crlcache.c:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr " HATA: CRL kullanılmayacak\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " HATA: Bu önbelleklenmiş CRL kurcalanmış olabilir!\n"
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " UYARI: Geçersiz önbellek kayıt uzunluğu\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2558
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "önbellek kaydı okunurken sorun: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2569
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "önbellek anahtarı okunurken sorun: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2600
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "veritabanından önbellek girdisi okunurken hata: %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2603
 msgid "End CRL dump\n"
 msgstr "CRL boşaltımını bitir\n"
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "DP aracılığıyla crl_fetch başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "DP aracılığıyla crl_cache_insert başarısız: %s\n"
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "veren aracılığıyla crl_cache_insert başarısız: %s\n"
@@ -10407,12 +10417,12 @@ msgstr "kullanım: %s [seçenekler] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "soket adında iki noktaya izin verilmiyor\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "'%s' konumundan CRL getirilemedi: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "'%s' konumundan CRL işlemesi başarısız: %s\n"
@@ -10657,91 +10667,91 @@ msgstr "'%s' için OCSP yanıtı sağlaması başarısız: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "bir öntanımlı OCSP imzalayıcısının sertifikasi ile imzalanmamış"
 
-#: dirmngr/ocsp.c:582
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "list ögesinin ayrılması başarısız: %s\n"
 
-#: dirmngr/ocsp.c:598 dirmngr/ocsp.c:782
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "yanıtlayıcı kimliği alınırken hata: %s\n"
 
-#: dirmngr/ocsp.c:642
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "OCSP yanıtını doğrulamak için uygun bir sertifika bulunamadı\n"
 
-#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "veren sertifikası bulunamadı: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "çağrıcı hedef sertifikayı döndürmedi\n"
 
-#: dirmngr/ocsp.c:698
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "çağrıcı veren sertifikayı döndürmedi\n"
 
-#: dirmngr/ocsp.c:708
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "OCSP bağlamı ayrılması başarısız: %s\n"
 
-#: dirmngr/ocsp.c:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "öntanımlı bir OCSP yanıtlayıcısı tanımlanmadı\n"
 
-#: dirmngr/ocsp.c:753
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "öntanımlı bir OCSP imzalayıcısı tanımlanmadı\n"
 
-#: dirmngr/ocsp.c:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "öntanımlı OCSP yanıtlayıcısı '%s' kullanılıyor\n"
 
-#: dirmngr/ocsp.c:765
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "OCSP yanıtlayıcısı '%s' kullanılıyor\n"
 
-#: dirmngr/ocsp.c:822
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "hedef sertifika için OCSP durumu alınırken hata: %s\n"
 
-#: dirmngr/ocsp.c:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "sertifika durumu: %s (bu=%s sonraki=%s)\n"
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "iyi"
 
-#: dirmngr/ocsp.c:854
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "sertifika şurada yürürlükten kaldırıldı: %s nedeni: %s\n"
 
-#: dirmngr/ocsp.c:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP yanıtlayıcısı gelecekte olan bir durum döndürdü\n"
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP yanıtlayıcısı geçerli olmayan bir durum döndürdü\n"
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP yanıtlayıcısı pek eski bir durum döndürdü\n"
@@ -10755,63 +10765,63 @@ msgstr "assuan_inquire(%s) başarısız: %s\n"
 msgid "serialno missing in cert ID"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire başarısız: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, c-format
 msgid "fetch_cert_by_url failed: %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
+#: dirmngr/server.c:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "veri gönderilirken hata: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch başarısız: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1776
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert başarısız: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d aşıldı\n"
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "denetim yapısı ayrılamıyor: %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "assuan bağlamı ayrılamadı: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "sunucu başlatılamadı: %s\n"
 
-#: dirmngr/server.c:3062
+#: dirmngr/server.c:3078
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "komutlar Assuan ile kayıt yapılamadı: %s\n"
 
-#: dirmngr/server.c:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan kabul sorunu: %s\n"
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan işlemesi başarısız: %s\n"
@@ -11117,33 +11127,33 @@ msgstr ""
 "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:2421
+#: tools/gpg-card.c:2425
 #, c-format
 msgid "Note: key %s is already stored on the card!\n"
 msgstr "Not: %s anahtarı halihazırda kart üzerinde depolanıyor!\n"
 
-#: tools/gpg-card.c:2424
+#: tools/gpg-card.c:2428
 #, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "Not: Anahtarlar halihazırda kart üzerinde depolanıyor!\n"
 
-#: tools/gpg-card.c:2427
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr "Mevcut %s anahtarı başkasıyla değiştirilsin mi? (e/H) "
 
-#: tools/gpg-card.c:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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 kart numarası %s algılandı\n"
 
-#: tools/gpg-card.c:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr "Kullanıcı etkileşim bayrağı \"%s\" olarak ayarlı - değiştirilemez\n"
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -11152,47 +11162,56 @@ 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr "Lütfen \"uif --yes %d %s\" kullanın\n"
 
-#: tools/gpg-card.c:3700
+#: tools/gpg-card.c:3758
 msgid "authenticate to the card"
 msgstr "karta kimlik doÄŸrula"
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr "kart ardalan sürecine sıfırlama gönder"
 
-#: tools/gpg-card.c:3704
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "PIN kimlik doğrulaması için KDF ayarla"
 
-#: tools/gpg-card.c:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr "bir gizli veri nesnesi deÄŸiÅŸtir"
 
-#: tools/gpg-card.c:3707
+#: tools/gpg-card.c:3765
 msgid "read a certificate from a data object"
 msgstr "bir veri nesnesinden bir sertifika oku"
 
-#: tools/gpg-card.c:3708
+#: tools/gpg-card.c:3766
 msgid "store a certificate to a data object"
 msgstr "bir veri nesnesine bir sertifika depola"
 
-#: tools/gpg-card.c:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr "bir veri nesnesine bir özel anahtar depola"
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr "Yubikey yönetim konsolu"
 
-#: tools/gpg-card.c:3712
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr "komut geçmişini yönet"
 
+#~ msgid "selected AEAD algorithm is invalid\n"
+#~ msgstr "seçili AEAD algoritması geçersiz\n"
+
+#~ msgid "invalid personal AEAD preferences\n"
+#~ msgstr "geçersiz kişisel AEAD tercihler\n"
+
+#~ msgid "AEAD algorithm '%s' may not be used in %s mode\n"
+#~ msgstr "'%s' AEAD algoritması, %s kipinde kullanılamayabilir\n"
+
 #~ msgid "run in supervised mode"
 #~ msgstr "yönetilen kipte çalıştır"
 
diff --git a/po/uk.gmo b/po/uk.gmo
index 5742de4..78f0b99 100644
--- a/po/uk.gmo
+++ b/po/uk.gmo
diff --git a/po/uk.po b/po/uk.po
index 5307352..d15a6eb 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.1.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2020-08-31 11:54+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -150,8 +150,8 @@ msgstr "Пінкод:"
 msgid "Passphrase:"
 msgstr "Пароль:"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "паролі не збігають��, повторіть �пробу"
 
@@ -200,17 +200,17 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "помилка під ча� �проби отриманн� �ерійного номера картки: %s\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Будь ла�ка, повторіть введенн� парол�"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -221,7 +221,7 @@ msgid ""
 msgstr ""
 "Будь ла�ка, введіть пароль дл� захи�ту імпортованого об’єкта у �и�темі GnuPG."
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -233,25 +233,25 @@ 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "не вдало�� відкрити «%s»: %s\n"
@@ -261,12 +261,12 @@ msgstr "не вдало�� відкрити «%s»: %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "не ви�влено відповідних ключів картки: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "помилка під ча� �проби отриманн� �пи�ку карток: %s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -275,20 +275,20 @@ msgstr ""
 "Проце�ом ssh наді�лано запит щодо викори�танн� ключа%%0A  %s%%0A  "
 "(%s)%%0A�адати до�туп до цього ключа?"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr "�адати"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Заборонити"
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -297,7 +297,7 @@ msgstr ""
 "Будь ла�ка, вкажіть пароль дл� захи�ту отриманого закритого ключа%%0A   %s"
 "%%0A   %s%%0Aу �ховищі ключів gpg-agent"
 
-#: agent/command-ssh.c:3797
+#: agent/command-ssh.c:3837
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "не вдало�� �творити потік даних з �окета: %s\n"
@@ -425,213 +425,219 @@ msgstr "Вкажіть пароль до%0Aз метою захи�ту вашо
 msgid "Please enter the new passphrase"
 msgstr "Вкажіть новий пароль"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Параметри діагно�тики"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr "запу�тити у режимі фонової �лужби (фоновий)"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr "запу�тити у режимі �ервера (о�новному)"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "не від’єднувати від кон�олі"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr "виведенн� команд у форматі sh"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr "виведенн� команд у форматі csh"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|прочитати параметри з вказаного файла"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr "Параметри керуванн� діагно�тичним виводом"
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "докладний режим"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "дещо зменшити кількі�ть повідомлень"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|запи�увати журнал режиму �ервера до файла"
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr "Параметри керуванн� налаштуванн�ми"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 msgid "do not use the SCdaemon"
 msgstr "не викори�товувати SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|викори�товувати вказану програму SCdaemon"
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|викори�товувати вказану програму SCdaemon"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|приймати певні команди через NAME"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr "ігнорувати запити щодо зміни TTY"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr "ігнорувати запити щодо зміни графічного ди�пле�"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 msgid "enable ssh support"
 msgstr "увімкнути підтримку ssh"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|�ЛГО|викори�тати алгоритм �ЛГО дл� показу відбитків ssh"
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 msgid "enable putty support"
 msgstr "увімкнути підтримку putty"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "увімкнути підтримку putty"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "Параметри керуванн� захи�том"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|вважати кешовані пінкоди за вказану кількі�ть �екунд"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|завершувати �трок дії ключів SSH за N �екунд"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|в�тановити мак�имальний �трок дії кешу пінкодів у �екундах"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|в�тановити мак�имальний �трок дії ключа SSH у �екундах"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr "не викори�товувати кеш пін-кодів дл� підпи�уванн�"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 msgid "disallow the use of an external password cache"
 msgstr "заборонити викори�танн� зовнішнього кешу паролів"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "заборонити клієнтам позначати ключі �к надійні"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 msgid "allow presetting passphrase"
 msgstr "дозволити попереднє в�тановленн� парол�"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr "Параметри приму�ового викори�танн� правил паролів"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr "не дозвол�ти обхід правил паролів"
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|в�тановити вказану мінімальну довжину нових паролів"
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|вимагати у нових парол�х не менше вказаної кілько�ті нелітер"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|перевір�ти нові паролі за зразком з вказаного файла"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|завершувати �трок дії паролів за вказану кількі�ть днів"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 msgid "do not allow the reuse of old passphrases"
 msgstr "не дозвол�ти повторне викори�танн� �тарих паролів"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Параметри керуванн� захи�том"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr "заборонити функції виклику перевизначати pinentry"
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "не захоплювати керуванн� клавіатурою і мишею"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|викори�товувати вказану програму пінзапи�ів"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|в�тановити вказаний ча� очікуванн� Pinentry у �екундах"
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: 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:570
+#: agent/gpg-agent.c:582
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Викори�танн�: @GPG_AGENT@ [параметри] (-h — довідка)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -639,137 +645,137 @@ msgstr ""
 "Синтак�и�: @GPG_AGENT@ [параметри] [команда [аргументи]]\n"
 "Керуванн� закритими ключами у @GNUPG@\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "вказано некоректне значенн� рівн� діагно�тики «%s»\n"
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "вибраний алгоритм побудови контрольних �ум є некоректним\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "прочитати параметри з «%s»\n"
 
-#: agent/gpg-agent.c:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "УВ�Г�: «%s» вважаєть�� за�тарілим параметром\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не вдало�� �творити �окет: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "назва �окета «%s» є надто довгою\n"
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent вже запущено, потреби у запу�ку нової копії немає\n"
 
-#: agent/gpg-agent.c:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "помилка під ча� �проби отриманн� поточного �тану �окета\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "помилка під ча� �проби прив’�зуванн� �окета до «%s»: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "не вдало�� в�тановити права до�тупу до «%s»: %s\n"
 
-#: agent/gpg-agent.c:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "очікуванн� даних на �океті «%s»\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "не вдало�� �творити каталог «%s»: %s\n"
 
-#: agent/gpg-agent.c:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "�творено каталог «%s»\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "помилка stat() щодо «%s»: %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "не можна викори�товувати �к домашній каталог «%s»\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr ""
 "помилка під ча� �проби читанн� поточного �тану на файловому де�крипторі %d: "
 "%s\n"
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "запущено обробки 0x%lx дл� файлового де�криптора %d\n"
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "обробник 0x%lx де�криптора файла %d завершив роботу\n"
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "запущено обробник ssh 0x%lx дл� де�криптора файла %d\n"
 
-#: agent/gpg-agent.c:2853
+#: agent/gpg-agent.c:2967
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "обробник ssh 0x%lx де�криптора файла %d завершив роботу\n"
 
-#: agent/gpg-agent.c:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "помилка pth_select: %s — очікуванн� у 1 �\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s зупинено\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1044,7 +1050,7 @@ msgstr "невдала �проба перевірити �творений пі
 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:1602
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr ""
@@ -1060,53 +1066,53 @@ msgstr "підтримки алгоритму захи�ту %d (%s) не пер
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1136,18 +1142,18 @@ msgstr "Увага: визначенн� вла�ника не є безпечн
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Увага: визначенн� прав до�тупу не є безпечним дл� %s — «%s»\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "очікуємо на отриманн� до�тупу до файла «%s»…\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "yes|так"
 
@@ -1202,8 +1208,8 @@ msgstr ""
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "помилка під ча� �проби розподілу пам’�ті: %s\n"
@@ -1223,75 +1229,75 @@ msgstr "УВ�Г�: «%s%s» є за�тарілим параметром — в
 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:432 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"
@@ -1439,11 +1445,11 @@ msgstr "Ланцюжок �ертифікації є чинним"
 msgid "Root certificate trustworthy"
 msgstr "Кореневий �ертифікат є гідним довіри"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 msgid "no CRL found for certificate"
 msgstr "не знайдено �пи�ку відкликанн� дл� �ертифіката"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 msgid "the available CRL is too old"
 msgstr "до�тупний �пи�ок відкликанн� є занадто �тарим"
 
@@ -1480,7 +1486,7 @@ msgstr "Довідки щодо «%s» не ви�влено."
 msgid "ignoring garbage line"
 msgstr "ігноруємо беззмі�товний р�док"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "[none]"
 msgstr "[немає]"
 
@@ -1524,36 +1530,36 @@ msgstr "помилка iconv_open: %s\n"
 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
 #, 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"
@@ -1563,92 +1569,92 @@ msgstr "очікуванн� на блокуванн� %s…\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s є занадто за�тарілою (потрібно %s, маємо %s)\n"
 
-#: g10/armor.c:441
+#: 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"
@@ -1656,12 +1662,12 @@ msgstr ""
 "�имволи quoted printable у кодуванні ASCII — ймовірно, викори�тано "
 "помилковий MTA\n"
 
-#: g10/build-packet.c:1462
+#: g10/build-packet.c:1480
 #, c-format
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "[ незручне дл� читанн� (%zu байтів: %s%s) ]"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1670,32 +1676,32 @@ msgstr ""
 "назва примітки має �кладати�� з друкованих �имволів або пробілів і "
 "завершувати�� �имволом «=»\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "назва примітки кори�тувача має мі�тити �имвол «@»\n"
 
-#: g10/build-packet.c:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "назва примітки не повинна мі�тити більше за один �имвол «@»\n"
 
-#: g10/build-packet.c:1550
+#: g10/build-packet.c:1568
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "у значенні примітки не повинно мі�тити�� керівних �имволів\n"
 
-#: g10/build-packet.c:1606
+#: g10/build-packet.c:1624
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "назва позначенн� не може мі�тити �имволів «=»\n"
 
-#: g10/build-packet.c:1612
+#: g10/build-packet.c:1630
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr "назва примітки має �кладати�� з друкованих �имволів або пробілів\n"
 
-#: g10/build-packet.c:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "УВ�Г�: ви�влено некоректні дані примітки\n"
@@ -1709,7 +1715,7 @@ msgstr "не вдалоÑ�Ñ� пропуÑ�тити через прокÑ�Ñ– запÐ
 msgid "Enter passphrase: "
 msgstr "Введіть пароль: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 g10/sign.c:473
 #: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
@@ -1727,7 +1733,7 @@ msgstr "помилка читанн� з %s: %s\n"
 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:2330
+#: 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"
@@ -1772,171 +1778,171 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "�творити �ертифікат відкликанн�"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "Ваш вибір? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "не увімкнено"
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "увімкнено"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 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:1500
+#: g10/card-util.c:803 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:1502
+#: g10/card-util.c:805 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Помилка: не можна викори�товувати подвійні пробіли.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "Прізвище вла�ника картки: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "Ім’� вла�ника картки: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "Дані кори�тувача (назва запи�у): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "О�оби�ті дані DO: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "О�новна мова: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "Помилка: некоректна відповідь.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "Відбиток CA: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Помилка: некоректне форматуванн� відбитка.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1296
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "ді� над ключем неможлива: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1297
 msgid "not an OpenPGP card"
 msgstr "не є карткою OpenPGP"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "помилка під ча� отриманн� даних поточного ключа: %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1395
 msgid "Replace existing key? (y/N) "
 msgstr "Замінити вже �творений ключ? (y/N або т/�) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 tools/gpg-card.c:3363
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1953,100 +1959,100 @@ msgstr ""
 "      ознайомте�� з документацією до вашої картки, щоб\n"
 "      визначити дозволені розміри.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Якою має бути довжина ключа? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr "Зміна атрибута ключа картки дл�: "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 msgid "Signature key\n"
 msgstr "Ключ підпи�уванн�\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 msgid "Encryption key\n"
 msgstr "Ключ шифруванн�\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr "Ключ розпізнаванн�\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "�екоректний вибір.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "З�УВ�ЖЕ��Я: ключі вже збережено на картці!\n"
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2429
+#: g10/card-util.c:1694 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "Замірити вже �творені ключі? (y/N або т/�) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2057,186 +2063,186 @@ msgstr ""
 "   PIN = «%s»     �дміні�тративний PIN = «%s»\n"
 "Вам �лід змінити параметри за допомогою команди --change-pin\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 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:1743 g10/card-util.c:1833
 msgid "   (1) Signature key\n"
 msgstr "   (1) Ключ підпи�уванн�\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1744 g10/card-util.c:1835
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Ключ шифруванн�\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ розпізнаванн�\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 msgid "Please select where to store the key:\n"
 msgstr "Виберіть �ховище дл� зберіганн� ключа:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1876
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "Помилка KEYTOCARD: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 "Справді хочете �кинути у�е до типових налаштувань? (введіть «yes» («так»)) "
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "помилка налаштуванн� KDF: %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "вийти з цього меню"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr "показати керівні команди"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "показати цю довідкову інформацію"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "показати в�і до�тупні дані"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "змінити ім’� вла�ника картки"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "змінити адре�у дл� отриманн� ключа"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3689
+#: g10/card-util.c:2262 tools/gpg-card.c:3747
 msgid "fetch the key specified in the card URL"
 msgstr "отримати ключ, вказаний у полі адре�и картки"
 
-#: g10/card-util.c:2264 tools/gpg-card.c:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "змінити ім’� кори�тувача"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "змінити о�новну мову"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 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:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "змінити відбиток CA"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "увімкнути або вимкнути позначку приму�ового пінкоду підпи�у"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "�творити ключі"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "меню зміни або розблокуванн� пінкоду"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3698
+#: g10/card-util.c:2271 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "перевірити пінкод і показати �пи�ок в�іх даних"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "розблокувати під коду за допомогою коду �киданн�"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr "знищити у�і ключі і дані"
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 #, 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:2276
 msgid "change the key attribute"
 msgstr "змінити атрибут ключа"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/картка> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 msgid "Admin-only command\n"
 msgstr "Команда адміні�тратора\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr "Команди адміні�труванн� дозволено\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 msgid "Admin commands are not allowed\n"
 msgstr "Команди адміні�труванн� заборонено\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�екоректна команда  (�кори�тайте�� командою «help»)\n"
 
-#: g10/decrypt.c:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output не працює з цією командою\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2294,9 +2300,9 @@ msgstr "ключ"
 msgid "subkey"
 msgstr "підключ"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "помилка оновленн�: %s\n"
@@ -2330,19 +2336,19 @@ msgstr ""
 "УВ�Г�: приму�ове викори�танн� �иметричного шифру %s (%d) не відповідає "
 "параметрам отримувача\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм шифруванн� «%s» не можна викори�товувати у режимі %s\n"
@@ -2352,33 +2358,34 @@ msgstr "алгоритм шифруваннÑ� «%s» не можна викорÐ
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "УВ�Г�: ключ %s не можна викори�товувати дл� шифруванн� у режимі %s\n"
 
-#: g10/encrypt.c:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "помилка під ча� �проби �творенн� парол�: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "викори�тано шифр %s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "«%s» вже �ти�нено\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "УВ�Г�: файл «%s» є порожнім\n"
 
-#: g10/encrypt.c:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
@@ -2386,12 +2393,12 @@ msgstr ""
 "алгоритм �творенн� контрольних �ум «%s» не можна викори�товувати у режимі "
 "%s\n"
 
-#: g10/encrypt.c:862
+#: g10/encrypt.c:853
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "читанн� з «%s»\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2400,13 +2407,13 @@ msgstr ""
 "УВ�Г�: приму�ове викори�танн� алгоритму �ти�ненн� %s (%d) не відповідає "
 "параметрам отримувача\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, c-format
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "параметр «%s» не можна викори�товувати у режимі %s\n"
@@ -2434,64 +2441,76 @@ msgstr ""
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "УВ�Г�: нічого не ек�портовано\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2557,7 +2576,7 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "викори�товуємо підключ %s замі�ть о�новного ключа %s\n"
 
-#: g10/getkey.c:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "коректні значенн� параметра «%s»:\n"
@@ -2630,113 +2649,113 @@ msgstr "швидке відкликаннÑ� ідентифікатора корÐ
 msgid "quickly set a new expiration date"
 msgstr "швидке в�тановленн� нової дати завершенн� �троку дії"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr "повноцінне �творенн� пари ключів"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "�творити �ертифікат відкликанн�"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "вилучити ключі з відкритого �ховища ключів"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "вилучити ключів з закритого �ховища ключів"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "quickly sign a key"
 msgstr "швидко підпи�ати ключ"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 msgid "quickly sign a key locally"
 msgstr "швидко підпи�ати ключ локально"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, fuzzy
 #| msgid "quickly revoke a user-id"
 msgid "quickly revoke a key signature"
 msgstr "швидке відкликанн� ідентифікатора кори�тувача"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "підпи�ати ключ"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "підпи�ати ключ локально"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "підпи�ати або редагувати ключ"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "змінити пароль"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "ек�портувати ключі"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "ек�портувати ключі на �ервер ключів"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "імпортувати ключі з �ервера ключів"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "шукати ключі на �ервері ключів"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "оновити в�і ключів з �ервера ключів"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "імпортувати/об’єднати ключі"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr "показати дані про �тан картки"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr "змінити дані на картці"
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr "змінити пінкод картки"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "оновити базу даних довіри"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 msgid "print message digests"
 msgstr "показати контрольні �уми повідомлень"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "запу�тити у режимі �ервера"
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|в�тановити вказане правило TOFU дл� ключа"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|викори�товувати вказаний типовий закритий ключ"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|шифрувати також до вказаного ідентифікатора кори�тувача"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|в�тановити замінники адре�и електронної пошти"
 
@@ -2752,62 +2771,62 @@ msgstr "не вно�ити змін"
 msgid "prompt before overwriting"
 msgstr "запитувати перед перезапи�ом"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Параметри керуванн� захи�том"
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Параметри керуванн� діагно�тичним виводом"
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "�творити дані у форматі ASCII"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|запи�ати дані до вказаного файла"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "викори�товувати канонічний тек�товий режим"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|в�тановити рівень �ти�ненн� (0 — вимкнути)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
 msgstr "Параметри керуванн� інтерактивні�тю та приму�ом"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 "|MECHANISMS|викори�товувати вказаний механізм дл� пошуку ключів за адре�ою"
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "імпортувати ключі з �ервера ключів"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "показати �пи�ок і перевірити підпи�и ключів"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "заборонити до�туп до dirmngr"
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2837,7 +2856,7 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2846,7 +2865,7 @@ msgstr ""
 "(Щоб ознайомити�� зі �пи�ком команд і параметрів, �кори�тайте�� �торінкою "
 "довідника (man))\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2867,11 +2886,11 @@ msgstr ""
 " --list-keys [назви]        показати ключі\n"
 " --fingerprint [назви]      показати відбитки\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Викори�танн�: @GPG@ [параметри] [файли] (-h — довідка)"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1172
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2881,7 +2900,7 @@ msgstr ""
 "Підпи�уванн�, перевірка підпи�ів, шифруванн� або розшифруванн�\n"
 "Типова ді� залежатиме від вхідних даних\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2889,77 +2908,77 @@ msgstr ""
 "\n"
 "Підтримувані алгоритми:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "Відкритий ключ: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "Шифр: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "Хеш: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "Сти�ненн�: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "кори�туванн�: %s [параметри] %s\n"
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "не�умі�ні команди\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "у визначенні групи «%s» немає знаку «=»\n"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1698
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "УВ�Г�: визначенн� вла�ника домашнього каталогу «%s» не є безпечним\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "УВ�Г�: визначенн� вла�ника у файлі налаштувань «%s» не є безпечним\n"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "УВ�Г�: визначенн� вла�ника додатка «%s» не є безпечним\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до домашнього каталогу «%s» не є безпечним\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до файла налаштувань «%s» не є безпечним\n"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "УВ�Г�: визначенн� прав до�тупу до додатка «%s» не є безпечним\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� вла�ника підлеглого каталогу домашнього каталогу «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1735
+#: g10/gpg.c:1725
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2967,21 +2986,21 @@ msgstr ""
 "УВ�Г�: визначенн� вла�ника у підлеглому каталозі, визначеному файлом "
 "налаштувань «%s», не є безпечним\n"
 
-#: g10/gpg.c:1738
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� вла�ника підлеглого каталогу у додатку «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1744
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до підлеглого каталогу домашнього каталогу "
 "«%s» не є безпечним\n"
 
-#: g10/gpg.c:1747
+#: g10/gpg.c:1737
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2989,490 +3008,478 @@ msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до підлеглого каталогу, визначеного файлом "
 "налаштувань «%s», не є безпечним\n"
 
-#: g10/gpg.c:1750
+#: g10/gpg.c:1740
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до підлеглого каталогу у додатку «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1966
+#: g10/gpg.c:1956
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "невідомий пункт налаштувань «%s»\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr "показувати фотоідентифікатори у �пи�ках ключів"
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 msgid "show key usage information during key listings"
 msgstr "показувати дані щодо викори�танн� ключа у �пи�ках ключів"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr "показувати адре�и правил у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 msgid "show all notations during signature listings"
 msgstr "показувати в�і примітки у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr "показувати �тандартні примітки IETF у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr "показувати примітки кори�тувача у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показувати адре�и о�новних �ерверів ключів у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr "показувати чинні�ть ідентифікаторів кори�тувачів у �пи�ках ключів"
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "показувати відкликані та за�тарілі ідентифікатори кори�тувачів у �пи�ках "
 "ключів"
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показувати відкликані та за�тарілі підключі у �пи�ках ключів"
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 msgid "show the keyring name in key listings"
 msgstr "показувати назву �ховища ключів у �пи�ках ключів"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 msgid "show expiration dates during signature listings"
 msgstr "показувати дати завершенн� �троків дії у �пи�ку підпи�ів"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "�пи�ок переваг (ек�пертний)"
+
+#: g10/gpg.c:2197
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "невідомі правила TOFU «%s»\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(команда «help» виводить �пи�ок можливих варіантів)\n"
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Цією командою не можна кори�тувати�� у режимі %s.\n"
 
-#: g10/gpg.c:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "З�УВ�ЖЕ��Я: %s не призначено дл� звичайного викори�танн�!\n"
 
-#: g10/gpg.c:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "«%s» не є коректним запи�ом завершенн� �троку дії підпи�у\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "«%s» не є коректною адре�ою електронної пошти\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "некоректний режим pinentry, «%s»\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "некоректне походженн� запиту «%s»\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "«%s» не є коректним набором �имволів\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "не вдало�� обробити адре�у �ервера ключів\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: некоректні параметри �ервера ключів\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "некоректні параметри �ервера ключів\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: некоректні параметри імпортуванн�\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "некоректні параметри імпортуванн�\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "некоректний параметр фільтруванн�: %s\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: некоректні параметри ек�портуванн�\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "некоректні параметри ек�портуванн�\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: некоректні параметри побудови �пи�ку\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr "некоректні параметри побудови �пи�ку\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr "показувати фотоідентифікатори під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr "показувати адре�и правил під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 msgid "show all notations during signature verification"
 msgstr "показувати в�і примітки під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr "показувати �тандартні примітки IETF під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr "показувати вказані кори�тувачем примітки під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "показувати адре�и о�новних �ерверів ключів у �пи�ках перевірки підпи�ів"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 msgid "show user ID validity during signature verification"
 msgstr ""
 "показувати чинні�ть ідентифікаторів кори�тувача під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "показувати відкликані та за�тарілі ідентифікатори кори�тувачів у �пи�ках "
 "перевірки підпи�ів"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "показувати лише о�новний ідентифікатор кори�тувача під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: некоректні параметри перевірки\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr "некоректні параметри перевірки\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не вдало�� в�тановити шл�х дл� запу�ку у значенн� %s\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: некоректний �пи�ок auto-key-locate\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "некоректний �пи�ок auto-key-locate\n"
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "некоректний аргумент параметра «%.50s»\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "УВ�Г�: можливе �творенн� дампу пам’�ті програми!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "УВ�Г�: %s перевизначає %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не можна викори�товувати разом з %s!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s є зайвим, �кщо викори�тано %s!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "УВ�Г�: запущено з фіктивним �и�темним ча�ом: "
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не буде запущено з помилками у захи�ті пам’�ті через %s\n"
 
-#: g10/gpg.c:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "вибраний алгоритм шифруванн� є некоректним\n"
 
-#: g10/gpg.c:3952
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "вибраний алгоритм побудови контрольних �ум є некоректним\n"
-
-#: g10/gpg.c:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "вибраний алгоритм �ти�канн� є некоректним\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "вибраний алгоритм �творенн� контрольних �ум дл� �ертифікації є некоректним\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "значенн� completes-needed має бути більшим за 0\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "значенн� marginals-needed має перевищувати 1\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "З�УВ�ЖЕ��Я: наполегливо не рекомендуємо вам кори�тувати�� про�тим режимом "
 "S2K (0)\n"
 
-#: g10/gpg.c:4001
+#: g10/gpg.c:3964
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "некоректний режим S2K; мало бути вказано 0, 1 або 3\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "некоректні типові параметри\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "некоректні о�оби�ті параметри шифруванн�\n"
 
-#: g10/gpg.c:4015
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "некоректні о�оби�ті параметри шифруванн�\n"
-
-#: g10/gpg.c:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "некоректні о�оби�ті параметри контрольної �уми\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "некоректні о�оби�ті параметри �ти�канн�\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "некоректний розмір ключа; викори�товуємо %u-бітовий\n"
 
-#: g10/gpg.c:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ще не може працювати разом з %s\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм �ти�канн� «%s» не можна викори�товувати у режимі %s\n"
 
-#: g10/gpg.c:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "не вдало�� ініціалізувати базу даних надійно�ті (TrustDB): %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "УВ�Г�: отримувачів (-r) вказано без викори�танн� шифруванн� відкритим "
 "ключем\n"
 
-#: g10/gpg.c:4388
+#: g10/gpg.c:4336
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "помилка під ча� �проби �иметричного шифруванн� «%s»: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "не можна викори�товувати комбінацію --symmetric --encrypt у режимі --s2k-"
 "mode 0\n"
 
-#: g10/gpg.c:4420
+#: g10/gpg.c:4368
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr ""
 "не можна викори�товувати комбінацію --symmetric --encrypt у режимі %s\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4426
 #, 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:4481
+#: g10/gpg.c:4429
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 "не можна викори�товувати комбінацію --symmetric --encrypt у режимі %s\n"
 
-#: g10/gpg.c:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "помилка під ча� над�иланн� даних на �ервер ключів: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "помилка під ча� �проби отриманн� даних з �ервера ключів: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "помилка під ча� �проби ек�портуванн� ключа: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "�проба ек�портуванн� ключа ssh зазнала невдачі: %s\n"
 
-#: g10/gpg.c:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "помилка пошуку на �ервері ключів: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "помилка оновленн� з �ервера ключів: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "помилка перетворенн� з формату ASCII: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "помилка перетворенн� у формат ASCII: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "некоректний алгоритм хешуванн� «%s»\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "помилка під ча� �проби обробки �пецифікації ключа «%s»: %s\n"
 
-#: g10/gpg.c:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "«%s» не є коректним ідентифікатором ключа, відбитком або кодом\n"
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "УВ�Г�: команд не надано. �амагаємо�� вгадати, що вам потрібно...\n"
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Почніть вводити ваше повідомленн�...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "вказана адре�а правил �ертифікації є некоректною\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "вказана адре�а правил підпи�уванн� є некоректною\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "вказана адре�а о�новного �ервера ключів є некоректною\n"
@@ -3485,7 +3492,7 @@ msgstr "|FILE|визначити ключі з файла Ñ�ховища клюÑ
 msgid "make timestamp conflicts only a warning"
 msgstr "�упроводжувати конфлікти ча�ових позначок лише попередженн�ми"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|запи�увати до де�криптора файла дані щодо �тану"
 
@@ -3514,157 +3521,157 @@ msgstr "Довідки не передбачено"
 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"
@@ -3673,175 +3680,175 @@ msgstr ""
 "УВ�Г�: у ключі %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:1998 g10/import.c:3146
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %s: немає ідентифікатор кори�тувача\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, c-format
 msgid "key %s: %s\n"
 msgstr "ключ %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr "відкинуто екранувальником імпорту"
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "ключ %s: відновлено пошкоджений підключ PKS\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2075
 #, 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:2086 g10/import.c:2117
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "ключ %s: немає чинних ідентифікаторів кори�тувача\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2088
 #, 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:2167 g10/import.c:3533
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %s: не знайдено відкритий ключ: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2173
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "ключ %s: новий ключ — пропущено\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "помилка під ча� �проби запи�у �ховища ключів «%s»: %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2240
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "ключ %s: імпортовано відкритий ключ «%s»\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2267
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %s: не відповідає нашій копії\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2335
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %s: «%s» 1 новий ідентифікатор кори�тувача\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2338
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "ключ %s: «%s» %d нових ідентифікаторів кори�тувачів\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2341
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "ключ %s: «%s» 1 новий підпи�\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2344
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "ключ %s: «%s» %d нових підпи�ів\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2347
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "ключ %s: «%s» 1 новий підключ\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "ключ %s: «%s» %d нових підключів\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "ключ %s: «%s» вилучено %d підпи�\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "ключ %s: «%s» вилучено %d підпи�ів\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "ключ %s: «%s» �порожнено %d ідентифікатор кори�тувача\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "ключ %s: «%s» �порожнено %d ідентифікаторів кори�тувачів\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2398
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %s: «%s» не змінено\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2785 g10/import.c:2980
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %s: імпортовано закритий ключ\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "ключ %s: закритий ключ вже і�нує\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2801
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "ключ %s: помилка під ча� �проби над�иланн� агенту: %s\n"
@@ -3854,204 +3861,204 @@ msgstr "ключ %s: помилка під чаÑ� Ñ�проби надÑ�иланÐ
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 "Дл� перене�енн� «%s» на кожній із карток пам’�ті �лід виконати таку команду: "
 "%s\n"
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "закритий ключ %s: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3138 g10/import.c:3177
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "імпортуванн� закритих ключів заборонено\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "Ідентифікатор кори�тувача втратив чинні�ть"
 
-#: g10/import.c:3387 g10/keylist.c:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "причина відкликанн�: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "коментар щодо відкликанн�: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "ключ %s: немає відкритого ключа — не можна за�то�овувати �ертифікат "
 "відкликанн�\n"
 
-#: g10/import.c:3485
+#: g10/import.c:3555
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %s: не вдало�� знайти початковий блок ключів: %s\n"
 
-#: g10/import.c:3492
+#: g10/import.c:3562
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %s: не вдало�� прочитати початковий блок ключів: %s\n"
 
-#: g10/import.c:3512
+#: g10/import.c:3582
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: некоректний �ертифікат відкликанн�: %s — відкинуто\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %s: імпортовано �ертифікат відкликанн� «%s»\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3703
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %s: немає ідентифікатор кори�тувача дл� підпи�у\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %s: непідтримуваний алгоритм �творенн� відкритого ключа\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "ключ %s: некоректний безпо�ередній підпи� ключа\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "ключ %s: немає підключа дл� зв’�зуванн� ключів\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3769
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %s: некоректне зв’�зуванн� підключів\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3788
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %s: вилучено кратне зв’�зуванн� підключів\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3812
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %s: немає підключа дл� відкликанн� ключа\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %s: некоректне відкликанн� підключа\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3840
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %s: вилучено кратне відкликанн� підключа\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3887
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %s: пропущено ідентифікатор кори�тувача «%s»\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %s: пропущено підключ\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %s: �ертифікат відкликанн� у помилковому мі�ці — пропущено\n"
 
-#: g10/import.c:3902
+#: g10/import.c:3985
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %s: некоректний �ертифікат відкликанн�: %s — пропущено\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4009
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %s: підпи� підключа у помилковому мі�ці — пропущено\n"
 
-#: g10/import.c:3924
+#: g10/import.c:4017
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %s: неочікуваний кла� підпи�у (0x%02X) — пропущено\n"
 
-#: g10/import.c:4097
+#: g10/import.c:4190
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "ключ %s: ви�влено дублюванн� ідентифікаторів кори�тувача — об’єднано\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %s: додано �ертифікат відкликанн� «%s»\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4482
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %s: додано безпо�ередній підпи� ключа\n"
@@ -4093,7 +4100,7 @@ msgstr[0] "вилучено %d дублікат підпи�у\n"
 msgstr[1] "вилучено %d дублікати підпи�ів\n"
 msgstr[2] "вилучено %d дублікатів підпи�ів\n"
 
-#: g10/key-check.c:726 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"
@@ -4101,7 +4108,7 @@ msgstr[0] "%d підпиÑ� не перевірено через те, що неÐ
 msgstr[1] "%d підпи�и не перевірено через те, що немає ключа\n"
 msgstr[2] "%d підпи�ів не перевірено через те, що немає ключа\n"
 
-#: g10/key-check.c:734 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"
@@ -4156,15 +4163,15 @@ msgstr "ре�ур� блоку ключів «%s»: %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "не вдало�� перебудувати кеш �ховища ключів: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[revocation]"
 msgstr "[відкликанн�]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[�амопідпи�]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4175,17 +4182,17 @@ msgstr ""
 "ключів інших\n"
 "кори�тувачів (за па�портами, відбитками з інших джерел тощо)\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 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:390 g10/pkclist.c:291
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = Я довір�ю повні�тю\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:408
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4195,52 +4202,52 @@ msgstr ""
 "Глибина, більша за 1, дозвол�є ключу, �кий ви підпи�уєте, �творювати\n"
 "надійні підпи�и від вашого імені.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:425
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr ""
 "Будь ла�ка, вкажіть домен обмеженн� цього підпи�у або нати�ніть Enter, �кщо "
 "такого домену немає.\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr "Пропу�каємо ідентифікатор кори�тувача «%s», �кий не є тек�товим.\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  �еможливо підпи�ати.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "Строк дії ідентифікатор кори�тувача «%s» �плив."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "Ідентифікатор кори�тувача «%s» не є �амопідпи�аним."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "Ідентифікатор кори�тувача «%s» можна підпи�увати.  "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr "Підпи�ати його? (y/N або т/�) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4249,12 +4256,12 @@ msgstr ""
 "Самопідпи� «%s»\n"
 "є підпи�ом у форматі PGP 2.x.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4263,11 +4270,11 @@ msgstr ""
 "Строк дії вашого поточного підпи�у «%s»\n"
 "завершено.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4276,45 +4283,45 @@ msgstr ""
 "Ваш поточний підпи� «%s»\n"
 "є локальним підпи�ом.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr ""
 "Бажаєте розширити �феру викори�танн� до повні�тю ек�портованого підпи�у? (y/"
 "N або т/�) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:748
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "«%s» вже було локально підпи�ано ключем %s\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "«%s» вже було підпи�ано ключем %s\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:758
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "Бажаєте підпи�ати його попри в�е? (y/N або т/�) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "�ічого підпи�увати ключем %s\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:804
 msgid "This key has expired!"
 msgstr "Строк дії цього ключа вичерпано!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "Строк дії цього ключа завершить�� %s.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "Бажаєте, щоб �трок дії вашого підпи�у був таким �амим? (Y/n або Т/н) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4325,269 +4332,269 @@ msgstr ""
 "�правді належить о�обі, ім’� �кої вказано вище? Якщо ви не знаєте відповіді, "
 "введіть «0».\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) �е буду відповідати.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) Мною не виконувало�� ні�ких перевірок.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) Мною виконано ча�ткову перевірку.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:881
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) Мною виконано ретельну перевірку.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:888
 msgid "Your selection? (enter '?' for more information): "
 msgstr "Ваш вибір? (введіть «?», щоб дізнати�� більше): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, 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:923
 msgid "This will be a self-signature.\n"
 msgstr "Це буде �амопідпи�.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "УВ�Г�: підпи� не буде позначено �к непридатний до ек�портуванн�.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "УВ�Г�: підпи� не буде позначено �к непридатний до відкликанн�.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:945
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "Підпи� буде позначено �к непридатний до ек�портуванн�.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:952
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "Підпи� буде позначено �к непридатний до відкликанн�.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "I have not checked this key at all.\n"
 msgstr "Цей ключ не перевір�в�� мною.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 msgid "I have checked this key casually.\n"
 msgstr "Цей ключ перевірено мною ча�тково.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 msgid "I have checked this key very carefully.\n"
 msgstr "Цей ключ ретельно перевірено мною.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:981
 msgid "Really sign? (y/N) "
 msgstr "Підпи�ати? (y/N або т/�) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "помилка під ча� �проби підпи�уванн�: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 "До ключа включено лише типовий заповнювач або запи�и ключа з картки — ні�ких "
 "паролів не потрібно змінювати.\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1152
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "ключ %s: помилка під ча� �проби зміни парол�: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "save and quit"
 msgstr "зберегти і вийти"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 msgid "show key fingerprint"
 msgstr "показати відбиток ключа"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "show the keygrip"
 msgstr "показати keygrip"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "показати �пи�ок ключів та ідентифікаторів кори�тувача"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "вибрати вказаний ідентифікатор кори�тувача"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr "вибрати вказаний підключ"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr "перевірити підпи�и"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "підпи�ати вибрані ідентифікатори кори�тувачів [* нижче наведено відповідні "
 "команди]"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "sign selected user IDs locally"
 msgstr "підпи�ати вибрані ідентифікатори кори�тувача локально"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 msgid "sign selected user IDs with a trust signature"
 msgstr "підпи�ати вибрані ідентифікатори кори�тувача підпи�ом надійно�ті"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "підпи�ати вибрані ідентифікатори кори�тувача підпи�ом, �кий не можна "
 "відкликати"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "add a user ID"
 msgstr "додати ідентифікатор кори�тувача"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "додати фотоідентифікатор"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr "вилучити вибрані ідентифікатори кори�тувача"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr "додати підключ"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr "додати ключ на картку пам’�ті"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr "пере�унути ключ на картку пам’�ті"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr "пере�унути резервний ключ на картку пам’�ті"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 msgid "delete selected subkeys"
 msgstr "вилучити вибрані підключі"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "додати ключ відкликанн�"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 msgid "delete signatures from the selected user IDs"
 msgstr "вилучити підпи�и з вибраних ідентифікаторів кори�тувача"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1314
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "змінити дату завершенн� �троку дії ключа або вибраних ключів"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1316
 msgid "flag the selected user ID as primary"
 msgstr "позначити вибраний ідентифікатор кори�тувача �к о�новний"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "�пи�ок переваг (ек�пертний)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "�пи�ок переваг (докладний)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 msgid "set preference list for the selected user IDs"
 msgstr "в�тановити �пи�ок параметрів дл� вибраних ідентифікаторів кори�тувачів"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1325
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "в�тановити адре�у о�новного �ервера ключів дл� вибраних ідентифікаторів "
 "кори�тувачів"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1327
 msgid "set a notation for the selected user IDs"
 msgstr "в�тановити примітку дл� вибраного ідентифікатора кори�тувача"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1329
 msgid "change the passphrase"
 msgstr "змінити пароль"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "змінити рівень довіри до вла�ника"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 msgid "revoke signatures on the selected user IDs"
 msgstr "відкликати підпи�и дл� вибраних ідентифікаторів кори�тувачів"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 msgid "revoke selected user IDs"
 msgstr "відкликати вибрані ідентифікатори кори�тувачів"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "revoke key or selected subkeys"
 msgstr "відкликати ключ або вибрані підключі"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "enable key"
 msgstr "увімкнути ключ"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr "вимкнути ключ"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr "показати вибрані фотоідентифікатори"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "ущільнити непридатні до викори�танн� ідентифікатори кори�тувачів і вилучити "
 "невикори�тані підпи�и з ключа"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1349
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "ущільнити непридатні до викори�танн� ідентифікатори кори�тувачів і вилучити "
 "в�і підпи�и з ключа"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1470
 msgid "Secret key is available.\n"
 msgstr "До�тупний закритий ключ.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 msgid "Secret subkeys are available.\n"
 msgstr "До�тупні закриті підключі.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1574
 msgid "Need the secret key to do this.\n"
 msgstr "Дл� цього потрібен закритий ключ.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4598,291 +4605,275 @@ msgstr ""
 "  «t» дл� надійних підпи�ів (tsign), «nr» дл� підпи�ів без відкликанн�\n"
 "  (nrsign) або будь-�ку комбінацію (ltsign, tnrsign тощо).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "Ключ відкликано."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "Підпи�ати в�і тек�тові ідентифікатори кори�тувача? (y/N або т/�) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1682
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Підпи�ати в�і ідентифікатори кори�тувача? (y/N або т/�) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1690
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Підказка: виберіть ідентифікатори кори�тувача дл� підпи�уванн�\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "(Скори�тайте�� командою «%s».)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 msgid "You can't delete the last user ID!\n"
 msgstr "�е можна вилучати о�танній ідентифікатор кори�тувача!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1755
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Вилучити в�і вибрані ідентифікатори кори�тувачів? (y/N або т/�) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 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:1814 g10/keyedit.c:1854
 msgid "Really move the primary key? (y/N) "
 msgstr "Вилучити о�новний ключ? (y/N або т/�) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 msgid "You must select exactly one key.\n"
 msgstr "Вам �лід вибрати лише один ключ.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 msgid "Command expects a filename argument\n"
 msgstr "Дл� команди �лід вказати аргумент з назвою файла\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "�е вдало�� відкрити «%s»: %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "Помилка читанн� резервного ключа з «%s»: %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1969
 msgid "You must select at least one key.\n"
 msgstr "Вам �лід вибрати принаймні один ключ.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1975
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Справді бажаєте вилучити вибрані ключі? (y/N або т/�) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Справді бажаєте вилучити цей ключ? (y/N або т/�) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2015
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Відкликати в�і вибрані ідентифікатори кори�тувачів? (y/N або т/�) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2016
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Відкликати цей ідентифікатор кори�тувача? (y/N або т/�) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2034
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Ви �правді бажаєте відкликати ве�ь ключ? (y/N або т/�) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2045
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Ви �правді бажаєте відкликати позначені підключі? (y/N або т/�) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2047
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Ви �правді бажаєте відкликати цей підключ? (y/N або т/�) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2105
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "�е можна в�тановлювати довіру до вла�ника, �кщо викори�товуєть�� вказана "
 "кори�тувачем база даних довіри\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2150
 msgid "Set preference list to:\n"
 msgstr "В�тановити �пи�ок переваг:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Оновити переваги дл� вибраних ідентифікаторів кори�тувачів? (y/N або т/�) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2159
 msgid "Really update the preferences? (y/N) "
 msgstr "Оновити параметри? (y/N або т/�) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Save changes? (y/N) "
 msgstr "Зберегти зміни? (y/N або т/�) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr "Вийти без збереженн�? (y/N або т/�) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Ключ не змінено, отже оновленн� непотрібне.\n"
 
-#: g10/keyedit.c:2557
+#: g10/keyedit.c:2558
 #, 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:2583
+#: g10/keyedit.c:2584
 #, 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:2646
+#: g10/keyedit.c:2647
 #, 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:2677
+#: g10/keyedit.c:2717
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "«%s» не є відбитком\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "«%s» не є о�новним відбитком\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "�екоректний ідентифікатор кори�тувача «%s»: %s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "No matching user IDs."
 msgstr "�емає відповідних ідентифікаторів кори�тувачів."
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "Nothing to sign.\n"
 msgstr "�ічого підпи�увати.\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "�е підпи�ано вами.\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "невдала �проба перевірити �творений підпи�: %s\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3251
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "«%s» не є коректним запи�ом завершенн� �троку дії\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "«%s» не є належним відбитком\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "не знайдено підключ «%s»\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "Контрольна �ума: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "Можливо�ті: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr "Сервер ключів без можливо�ті зміни"
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "О�новний �ервер ключів: "
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr "Примітки: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Переваг дл� ідентифікаторів кори�тувачів у форматі PGP 2.x не передбачено.\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3735
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Вказаний нижче ключ було відкликано %s %s ключем %s\n"
 
-#: g10/keyedit.c:3867
+#: g10/keyedit.c:3759
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Цей ключ може бути відкликано %s ключем %s"
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr "(важливий)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "�творено: %s"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr "відкликано: %s"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr "не діє з: %s"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "діє до: %s"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr "викори�танн�: %s"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr "номер картки: "
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr "надійні�ть: %s"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr "чинні�ть: %s"
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "Цей ключ було вимкнено"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4890,17 +4881,17 @@ msgstr ""
 "Зауважте, що показані дані щодо чинно�ті ключів не обов’�зково є коректними\n"
 "до перезапу�ку програми.\n"
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "збіг �трок дії"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4911,17 +4902,17 @@ msgstr ""
 "              цієї команди можна зробити о�новним інший ідентифікатор "
 "кори�тувача.\n"
 
-#: g10/keyedit.c:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "УВ�Г�: �трок дії вашого підключа імпортуванн� невдовзі завершить��.\n"
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Ймовірно, вам варто змінити також і його �трок дії.\n"
 
-#: g10/keyedit.c:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4931,37 +4922,37 @@ msgstr ""
 "до відмови\n"
 "         у викори�танні цього ключа де�кими вер�і�ми PGP.\n"
 
-#: g10/keyedit.c:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ви �правді бажаєте додати його? (y/N або т/�) "
 
-#: g10/keyedit.c:4324
+#: g10/keyedit.c:4216
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "�е можна додавати фотоідентифікатор до ключа у форматі PGP2.\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4231
 #, 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:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Вилучити цей дій�ний підпи�? (y/N/q або т/�/в)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Вилучити цей некоректний підпи�? (y/N/q або т/�/в)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Вилучити цей невідомий підпи�? (y/N/q або т/�/в)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Вилучити цей �амопідпи�? (y/N або т/�)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4969,20 +4960,20 @@ msgstr[0] "Вилучено %d підпи�.\n"
 msgstr[1] "Вилучено %d підпи�и.\n"
 msgstr[2] "Вилучено %d підпи�ів.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "�ічого не вилучено.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "некоректний"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Ідентифікатор кори�тувача «%s» ущільнено: %s\n"
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4990,17 +4981,17 @@ msgstr[0] "Ідентифікатор кориÑ�тувача «%s»: вилучÐ
 msgstr[1] "Ідентифікатор кори�тувача «%s»: вилучено %d підпи�ів\n"
 msgstr[2] "Ідентифікатор кори�тувача «%s»: вилучено %d підпи�ів\n"
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Ідентифікатор кори�тувача «%s»: вже мінімізовано\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Ідентифікатор кори�тувача «%s»: вже очищено\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5010,42 +5001,42 @@ msgstr ""
 "призве�ти до відмови\n"
 "         у викори�танні цього ключа де�кими вер�і�ми PGP.\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "�е можна додавати підпи�ане відкликанн� до ключа у форматі PGP 2.x.\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Вкажіть ідентифікатор кори�тувача підпи�аного відкликанн�: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "не можна призначати ключ у форматі PGP 2.x підпи�аним відкликанн�м\n"
 
-#: g10/keyedit.c:4673
+#: g10/keyedit.c:4565
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "не можна призначати ключ вла�ним підпи�аним відкликанн�м\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4587
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "цей ключ вже було позначено �к призначений дл� відкликанн�\n"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4605
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "УВ�Г�: призначенн� ключа �к підпи�аного відкликанн� не можна �ка�овувати!\n"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4611
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Ви �правді бажаєте призначити цей ключ �к підпи�ане відкликанн�? (y/N або т/"
 "�) "
 
-#: g10/keyedit.c:4788
+#: g10/keyedit.c:4680
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -5053,176 +5044,176 @@ msgstr ""
 "Ви �правді хочете змінити ча� вичерпанн� �троку дії дл� декількох підключів? "
 "(y/N або т/�) "
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Зміна ча�у завершенн� �троку дії дл� підключа.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Зміна ча�у завершенн� �троку дії дл� о�новного ключа.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "�е можна змінювати дату завершенн� �троку дії ключа v3\n"
 
-#: g10/keyedit.c:4912
+#: g10/keyedit.c:4804
 msgid "Changing usage of a subkey.\n"
 msgstr "Змінюємо викори�танн� підключа.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 msgid "Changing usage of the primary key.\n"
 msgstr "Змінюємо викори�танн� о�новного підключа.\n"
 
-#: g10/keyedit.c:5033
+#: g10/keyedit.c:4925
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "підпи�уванн� підключа %s вже перехре�но �ертифіковано\n"
 
-#: g10/keyedit.c:5039
+#: g10/keyedit.c:4931
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "підключ %s не призначено дл� підпи�уванн�, отже його не потрібно перехре�но "
 "�ертифікувати\n"
 
-#: g10/keyedit.c:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "Будь ла�ка, виберіть лише один ідентифікатор кори�тувача.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропу�каємо �амопідпи� v3 дл� ідентифікатора кори�тувача «%s»\n"
 
-#: g10/keyedit.c:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr "Вкажіть адре�у вашого о�новного �ервера ключів: "
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ви �правді бажаєте замінити його? (y/N або т/�) "
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ви �правді бажаєте вилучити його? (y/N або т/�) "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 msgid "Enter the notation: "
 msgstr "Вкажіть примітку: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 msgid "Proceed? (y/N) "
 msgstr "Продовжувати? (y/N або т/�) "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ідентифікатора кори�тувача з індек�ом %d не і�нує\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ідентифікатора кори�тувача з хешем %s не і�нує\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Піключа із ідентифікатором ключа «%s» не і�нує.\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Підключа з індек�ом %d не і�нує\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Ідентифікатор кори�тувача: «%s»\n"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "підпи�ано вашим ключем %s %s%s%s\n"
 
-#: g10/keyedit.c:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (неек�портовний)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Строк дії цього підпи�у завершуєть�� %s.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ви �правді бажаєте відкликати його? (y/N або т/�) "
 
-#: g10/keyedit.c:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Створити �ертифікат відкликанн� дл� цього підпи�у? (y/N або т/�) "
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вами підпи�ано ці ідентифікатори кори�тувачів у ключі %s:\n"
 
-#: g10/keyedit.c:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr " (невідкликуваний)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "відкликано вашим ключем %s у %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "Ви маєте намір відкликати ці підпи�и:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Справді �творити �ертифікати відкликанн�? (y/N або т/�) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "немає закритого ключа\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "�проба відкликати ідентифікатор, �кий не належить кори�тувачеві: %s\n"
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ідентифікатор кори�тувача «%s» вже відкликано\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "УВ�Г�: підпи� ідентифікатора кори�тувача позначено датою на %d �екунд у "
 "майбутньому\n"
 
-#: g10/keyedit.c:6426
+#: g10/keyedit.c:6320
 #, 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:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s вже відкликано.\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Підключ %s вже відкликано.\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ фотоідентифікатора %s розміру %ld дл� ключа %s (uid %d)\n"
@@ -5263,33 +5254,33 @@ msgstr "занадто багато запи�ів переваг шифрів\n
 msgid "invalid item '%s' in preference string\n"
 msgstr "некоректний запи� «%s» у р�дку переваг\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "запи�уванн� безпо�ереднього підпи�у\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "запи�уванн� �амопідпи�у\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "запи�уванн� підпи�у прив’�зуванн� ключа\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "некоректний розмір ключа; викори�товуємо %u-бітовий\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "розмір ключа округлено до %u-бітового\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
@@ -5297,19 +5288,19 @@ msgstr ""
 "УВ�Г�: де�кі з програм OpenPGP не можуть працювати з ключем DSA з таким "
 "розміром контрольної �уми\n"
 
-#: g10/keygen.c:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr "Підпи�ати"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr "Сертифікувати"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr "Зашифрувати"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr "Пройти розпізнаванн�"
 
@@ -5323,181 +5314,181 @@ msgstr "Пройти розпізнаванн�"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "Можливі дії з ключем %s: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr "Поточні дозволені дії: "
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) увімкнути або вимкнути можливі�ть підпи�уванн�\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) увімкнути або вимкнути можливі�ть шифруванн�\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr ""
 "   (%c) увімкнути або вимкнути можливі�ть викори�танн� дл� розпізнаванн�\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) вийти\n"
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, 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:2131
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA Ñ– Elgamal\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (лише підпи�уванн�)\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2113
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (лише підпи�уванн�)\n"
 
-#: g10/keygen.c:2142
+#: g10/keygen.c:2119
 #, fuzzy, c-format
 #| msgid "   (%d) Elgamal (encrypt only)\n"
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (лише шифруванн�)\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (лише шифруванн�)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2127
 #, 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:2152
+#: g10/keygen.c:2129
 #, 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:2158
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid "   (%d) sign, encrypt\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) підпи�уванн�, шифруванн�\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC (лише підпи�уванн�)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, 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:2163
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC (лише шифруванн�)\n"
 
-#: g10/keygen.c:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) Вже запи�аний ключ\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) Вже запи�аний ключ з картки\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "Вкажіть keygrip: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "�емає ключів з таким значенн�м keygrip\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "Серійний номер картки: %s\n"
 
-#: g10/keygen.c:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "До�тупні ключі:\n"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "округлено до %u бітів\n"
 
-#: g10/keygen.c:2570
+#: g10/keygen.c:2547
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "ключі %s можуть мати довжину від %u до %u бітів.\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2555
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "Якою має бути довжина підключа? (%u) "
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запитана довжина ключа — %u бітів\n"
 
-#: g10/keygen.c:2641
+#: g10/keygen.c:2618
 msgid "Please select which elliptic curve you want:\n"
 msgstr "Вкажіть потрібну вам еліптичну криву:\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5513,7 +5504,7 @@ msgstr ""
 "      <n>m = �трок чинно�ті у n мі��ців\n"
 "      <n>y = �трок чинно�ті у n років\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5529,38 +5520,38 @@ msgstr ""
 "      <n>m = �трок чинно�ті підпи�у у n мі��ців\n"
 "      <n>y = �трок чинно�ті підпи�у у n років\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "Яким є �трок чинно�ті ключа? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Яким є �трок чинно�ті підпи�у? (%s) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "некоректне значенн�\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr "Ключ не має обмеженн� �троку дії\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr "Підпи� не має обмеженн� �троку дії\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ діє до %s\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Підпи� діє до %s\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5568,11 +5559,11 @@ msgstr ""
 "У вашій �и�темі неможливий показ дат пі�л� 2038 року.\n"
 "�ле програма коректно обробл�тиме ці дати до 2106 року.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr "В�е правильно? (y/N або т/�) "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5587,7 +5578,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5604,41 +5595,41 @@ msgstr ""
 "    \"Ivan Ivanenko (farmer) <iivanenko@moyahata.ua>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "Справжнє ім’�: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "�екоректний �имвол у імені\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "�е можна викори�товувати �имволи «%s» і «%s» у назві\n"
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "�дре�а ел. пошти: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "�екоректна адре�а електронної пошти\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "Коментар: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "�екоректний �имвол у коментарі\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "Вами викори�тано таблицю �имволів «%s».\n"
 
-#: g10/keygen.c:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5649,13 +5640,13 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Будь ла�ка, не викори�товуйте адре�у електронної пошти у пол�х �правжнього "
 "імені або коментар�\n"
 
-#: g10/keygen.c:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr "У цьому ключі вже і�нує такий ідентифікатор кори�тувача!\n"
 
@@ -5670,32 +5661,32 @@ msgstr "У цьому ключі вже і�нує такий ідентифік
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Змінити назву (N), коментар (C), ел. пошту (E) або вийти (Q)? "
 
-#: g10/keygen.c:3142
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Змінити назву (N), коментар (C), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
 
-#: g10/keygen.c:3147
+#: g10/keygen.c:3124
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "Змінити назву (N), ел. пошту (E) або вийти (Q)? "
 
-#: g10/keygen.c:3148
+#: g10/keygen.c:3125
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "Змінити назву (N), ел. пошту (E) або гаразд (O) чи вийти (Q)? "
 
-#: g10/keygen.c:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "Спочатку виправте помилку\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5707,18 +5698,18 @@ msgstr ""
 "під ча� �творенн� про�того чи�ла. Це нада�ть змогу генератору\n"
 "п�евдовипадкових чи�ел �творити краще випадкове чи�ло.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Помилка під ча� �проби �творенн� ключа: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5729,66 +5720,66 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr "Продовжити? (Y (так)/n (ні)) "
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "Ключ дл� «%s» вже і�нує\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 msgid "Create anyway? (y/N) "
 msgstr "Створити попри це? (y (так)/N (ні)) "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, c-format
 msgid "creating anyway\n"
 msgstr "�творюємо попри у�е\n"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr ""
 "Зауваженн�: �кори�тайте�� «%s %s», щоб викликати повноцінне діалогове вікно "
 "�творенн� ключа.\n"
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "Створенн� ключа �ка�овано.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "не вдало�� �творити файл резервної копії «%s»: %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "З�УВ�ЖЕ��Я: резервну копію ключа на картці збережено до «%s»\n"
 
-#: g10/keygen.c:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "запи�уємо відкритий ключ до «%s»\n"
 
-#: g10/keygen.c:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "не знайдено придатного до запи�у �ховища відкритих ключів: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "помилка під ча� �проби запи�у до �ховища відкритих ключів «%s»: %s\n"
 
-#: g10/keygen.c:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "відкритий і закритий ключі �творено і підпи�ано.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 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"
@@ -5796,7 +5787,7 @@ msgstr ""
 "Зауважте, що цей ключ не може бути викори�тано дл� шифруванн�. Ви можете\n"
 "�кори�тати�� командою «--edit-key» дл� �творенн� підключа з цією метою.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -5804,7 +5795,7 @@ msgstr ""
 "ключ було �творено з позначкою на %lu �екунд у майбутньому (ча�ова петл� або "
 "проблема з годинником)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -5812,22 +5803,22 @@ msgstr ""
 "ключ було �творено з позначкою на %lu �екунду у майбутньому (ча�ова петл� "
 "або проблема з годинником)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "З�УВ�ЖЕ��Я: �творенн� підключів дл� ключів v3 не�умі�не з OpenPGP\n"
 
-#: g10/keygen.c:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Закриті ча�тини о�новного ключа недо�тупні.\n"
 
-#: g10/keygen.c:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Закриті ча�тини о�новного ключа зберігають�� на картці.\n"
 
-#: g10/keygen.c:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr "Створити? (y/N або т/�) "
 
@@ -5835,27 +5826,43 @@ msgstr "Створити? (y/N або т/�) "
 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"
@@ -5863,7 +5870,7 @@ msgstr[0] "%d добрий підпи�\n"
 msgstr[1] "%d добрих підпи�и\n"
 msgstr[2] "%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"
@@ -5871,7 +5878,7 @@ msgstr[0] "%d підпи� не перевірено через помилку\n
 msgstr[1] "%d підпи�и не перевірено через помилку\n"
 msgstr[2] "%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"
@@ -5881,33 +5888,33 @@ msgstr[1] ""
 msgstr[2] ""
 "Попередженн�: %lu ключів пропущено через їхній надто великий розмір\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "Сховище ключів"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "О�новний відбиток ключа:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr "Відбиток о�новного ключа:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "       Відбиток підключа:"
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr "      Відбиток ключа ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr "Серійний номер картки ="
 
@@ -6286,7 +6293,7 @@ msgstr "двійковий"
 msgid "textmode"
 msgstr "тек�товий"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "невідомо"
 
@@ -6427,28 +6434,28 @@ msgstr "�е�ти�нений"
 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:1614
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "неоднозначний параметр «%s»\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "невідомий параметр «%s»\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "невідома �лабка контрольна �ума «%s»\n"
@@ -6569,7 +6576,7 @@ msgstr ""
 "�творено %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6584,71 +6591,71 @@ msgstr ""
 "дуже велике зображенн�, ваш ключ також �тане дуже великим!\n"
 "Варто дотримувати�� розмірів, близьких до 240x288.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "Вкажіть назву файла JPEG дл� фотоідентифікатора: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "не вдало�� відкрити файл JPEG «%s»: %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:239
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "Цей файл JPEG є дуже великим (%d байтів)!\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:241
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "Вам �правді хочеть�� ним �кори�тати��? (y/N або т/�) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:257
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "«%s» не є файлом JPEG\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "Це потрібна вам фотографі� (y/N/q)? "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "виконанн� віддалених програм не передбачено\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:593
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr ""
 "на цій платформі �лід викори�товувати тимча�ові файли під ча� виклику "
 "зовнішніх програм\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "неприродний вихід з зовнішньої програми\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "�и�темна помилка під ча� �проби виклику зовнішньої програми: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:707
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "УВ�Г�: не вдало�� вилучити тимча�овий файл (%s) «%s»: %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:711
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "УВ�Г�: не вдало�� вилучити тимча�овий каталог «%s»: %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
@@ -6656,7 +6663,7 @@ msgstr ""
 "виклик зовнішніх програм вимкнено через невідповідні�ть прав до�тупу до "
 "файла параметрами безпеки\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "показ фотоідентифікатора неможливий!\n"
@@ -6980,12 +6987,12 @@ msgstr "невідомий типовий отримувач «%s»\n"
 msgid "no valid addressees\n"
 msgstr "немає коректних адре�\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "Зауваженн�: у ключі %s не передбачено можливо�ті %s\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "Зауваженн�: у ключі %s не передбачено переваг дл� %s\n"
@@ -8100,7 +8107,7 @@ msgstr "викори�товуємо модель довіри %s\n"
 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"
@@ -8130,7 +8137,7 @@ msgstr "будь ла�ка, �кори�тайте�� параметром --c
 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"
@@ -8138,7 +8145,7 @@ msgstr[0] "оброблено %d ключ"
 msgstr[1] "оброблено %d ключі"
 msgstr[2] "оброблено %d ключів"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
@@ -8146,17 +8153,17 @@ msgstr[0] " (очищено %d значенн� чинно�ті)\n"
 msgstr[1] " (очищено %d значенн� чинно�ті)\n"
 msgstr[2] " (очищено %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"
@@ -8164,7 +8171,7 @@ 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 "не вдало�� оновити запи� вер�ії trustdb: помилка запи�у: %s\n"
@@ -8289,7 +8296,7 @@ msgstr ""
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8297,7 +8304,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8341,7 +8348,7 @@ msgstr ""
 "|P|Будь ла�ка, вкажіть код розблокуванн� пінкоду (PUK) дл� �тандартних "
 "ключів."
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8429,7 +8436,7 @@ msgstr[2] "Ñ�твореннÑ� ключа завершено (за %d Ñ�екунÐ
 msgid "response does not contain the public key data\n"
 msgstr "відповідь не мі�тить даних відкритого ключа\n"
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 scd/app-nks.c:2108
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 "||Будь ла�ка, вкажіть пінкод дл� ключа, призначеного дл� �творенн� �кі�них "
@@ -8437,62 +8444,62 @@ 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Вкажіть адміні�тративний пінкод"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Вкажіть пінкод дл� �тандартних ключів."
 
-#: scd/app-nks.c:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 "�е знайдено о�нови чи�ленн� RSA або о�нова чи�ленн� не належить до %d-"
 "бітових\n"
 
-#: scd/app-nks.c:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 "�е ви�тачає відкритого показника RSA або розмірні�ть показника перевищує %d "
 "бітів\n"
 
-#: scd/app-nks.c:1654
+#: 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:1701
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN ще не було змінено\n"
 
-#: scd/app-nks.c:2074
+#: scd/app-nks.c:2088
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Вкажіть новий пінкод дл� �тандартних ключів."
 
-#: scd/app-nks.c:2082
+#: 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:2092
+#: 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:2102
+#: scd/app-nks.c:2116
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8500,7 +8507,7 @@ msgstr ""
 "|NP|Будь ла�ка, вкажіть новий код розблокуванн� пінкоду (PUK) дл� �творенн� "
 "�кі�них підпи�ів."
 
-#: scd/app-nks.c:2104
+#: scd/app-nks.c:2118
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8508,7 +8515,7 @@ msgstr ""
 "|P|Будь ла�ка, вкажіть код розблокуванн� пінкоду (PUK) дл� �творенн� �кі�них "
 "підпи�ів."
 
-#: scd/app-nks.c:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "помилка під ча� отриманн� нового пінкоду: %s\n"
@@ -8774,13 +8781,13 @@ msgstr "запущено запу�к обробки дл� де�криптор
 msgid "handler for fd %d terminated\n"
 msgstr "роботу обробника дл� де�криптора %d перервано\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8789,11 +8796,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr "модель перевірки, запитана �ертифікатом: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:199 sm/certchain.c:2211
 msgid "chain"
 msgstr "ланцюжок"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 msgid "shell"
 msgstr "оболонка"
 
@@ -8816,236 +8823,236 @@ msgstr "правила, позначені Ñ�к критичні, без налÐ
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "не вдало�� отримати відбиток\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "пошук видавц� за зовнішньою адре�ою\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "кількі�ть відповідних видавців: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "не вдало�� отримати authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:793
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "пошук видавц� у кеші dirmngr\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:818
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "кількі�ть відповідних �ертифікатів: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "не вдало�� розмі�тити де�криптор keyDB\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1260 sm/certchain.c:1264
 msgid "certificate has been revoked"
 msgstr "�ертифікат відкликано"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr "�тан �ертифікату є невідомим"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "будь ла�ка, переконайте��, що «dirmngr» в�тановлено належним чином\n"
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr "�ертифікат ще не набув чинно�ті"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 msgid "root certificate not yet valid"
 msgstr "кореневий �ертифікат ще не набув чинно�ті"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr "проміжний �ертифікат ще не набув чинно�ті"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr "�трок дії �ертифіката завершив��"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 msgid "root certificate has expired"
 msgstr "�трок дії кореневого �ертифіката завершив��"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 msgid "intermediate certificate has expired"
 msgstr "�трок дії проміжного �ертифіката завершив��"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "не ви�тачає обов’�зкових атрибутів �ертифіката: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1404
 msgid "certificate with invalid validity"
 msgstr "�ертифікат з некоректною чинні�тю"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr "підпи� не було �творено під ча� �троку дії �ертифіката"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr "�ертифікат не було �творено під ча� �троку чинно�ті видавц�"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "проміжний �ертифікат не було �творено під ча� �троку чинно�ті видавц�"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (       підпи� �творено "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (   �ертифікат �творено "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (   �ертифікат чинний з "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (     видавець чинний з "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "відбиток=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "кореневий �ертифікат було позначено �к надійний\n"
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1505
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "не увімкнено інтерактивне позначенн� надійно�ті у gpg-agent\n"
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1511
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "інтерактивне позначенн� надійно�ті вимкнено дл� цього �еан�у\n"
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "УВ�Г�: невідомий ча� �творенн� підпи�у — припу�каємо поточний ча�"
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 msgid "no issuer found in certificate"
 msgstr "у �ертифікаті не було знайдено даних щодо видавц�"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 msgid "self-signed certificate has a BAD signature"
 msgstr "�амопідпи�аний �ертифікат має ПОМИЛКОВИЙ підпи�"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "кореневий �ертифікат не позначено �к надійний"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "помилка перевірки �пи�ку довіри: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "занадто довгий ланцюжок �ертифікації\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr "не знайдено видавц� �ертифіката"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "�ертифікат має ПОМИЛКОВИЙ підпи�"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1911 dirmngr/validate.c:693
 msgid "found another possible matching CA certificate - trying again"
 msgstr ""
 "ви�влено інший можливий відповідний �ертифікат �лужби �ертифікації (CA) — "
 "повторюємо �пробу"
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr "�ертифікат є належним\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "належний проміжний �ертифікат\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, c-format
 msgid "root certificate is good\n"
 msgstr "належний кореневий �ертифікат\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr "перемикаємо�� на ланцюгову модель"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr "викори�тана модель перевірки: %s"
@@ -9068,7 +9075,7 @@ msgstr "вихід за межі обла�ті пам’�ті\n"
 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:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "немає"
 
@@ -9103,42 +9110,42 @@ msgstr ""
 "С/� %s, ідентифікатор 0x%08lX,\n"
 "�творено %s, за�таріває %s.\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "не вказано викори�танн� ключа — припу�каємо в�і можливі викори�танн�\n"
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "�ертифікат не мав викори�товувати�� дл� �ертифікації\n"
 
-#: sm/certlist.c:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "�ертифікат не мав викори�товувати�� дл� підпи�уванн� відповідей OCSP\n"
 
-#: sm/certlist.c:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "�ертифікат не мав викори�товувати�� дл� шифруванн�\n"
 
-#: sm/certlist.c:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "�ертифікат не мав викори�товувати�� дл� підпи�уванн�\n"
 
-#: sm/certlist.c:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "�ертифікат непридатний дл� шифруванн�\n"
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "�ертифікат непридатний дл� підпи�уванн�\n"
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9703,7 +9710,7 @@ msgstr "алгоритм хешуваннÑ�, викориÑ�таний длÑ� пÑ
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "помилка перевірки �ко�ті �ертифікатів: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
@@ -9896,7 +9903,7 @@ msgstr "вилучаємо файл кешу «%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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "помилка під ча� �проби закритт� файла кешу: %s\n"
@@ -10148,139 +10155,139 @@ msgstr "невідомий алгоритм хешуванн� «%s»\n"
 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:1849 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "�проба �творенн� виразу S зазнала невдачі: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1923
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "помилка ksba_crl_parse: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1938
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "помилка під ча� �проби отриманн� даних щодо ча�у оновленн� з CRL: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1945
 #, 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:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "не вказано nextUpdate; вважаємо періодом чинно�ті один день\n"
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "помилка під ча� �проби отриманн� запи�у CRL: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1984
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr ""
 "помилка під ча� �проби додаванн� пункту до файла тимча�ового кешу: %s\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2011
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "не ви�влено видавц� CRL у CRL: %s\n"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "пошук видавц� CRL �ертифіката за authorityKeyIdentifier\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "помилка перевірки підпи�у CRL: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2084
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr ""
 "помилка під ча� �проби перевірки чинно�ті �ертифіката видавц� CRL: %s\n"
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2226
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "помилка ksba_crl_new: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2233
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "помилка ksba_crl_set_reader: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2267
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "вилучено за�тарілий тимча�овий файл кешу «%s»\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2271
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr ""
 "помилка під ча� �проби вилученн� за�тарілого тимча�ового файла кешу «%s»: "
 "%s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "помилка під ча� �проби �творенн� тимча�ового файла кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2291
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "помилка crl_parse_insert: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr ""
 "помилка під ча� �проби завершенн� запи�у тимча�ового файла кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2308
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "помилка під ча� �проби закритт� тимча�ового файла кешу «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2333
 #, 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:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "новий CRL в�е ще занадто �тарий; його �трок дії завершуєть�� %s\n"
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "невідомий критичний додаток CRL %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "помилка під ча� читанн� додатків CRL: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2414
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "�творюємо файл кешу «%s»\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "проблема під ча� перейменуванн� «%s» на «%s»: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2460
 #, c-format
 msgid ""
 "updating the DIR file failed - cache entry will get lost with the next "
@@ -10289,12 +10296,12 @@ msgstr ""
 "помилка під ча� �проби оновленн� файла каталогу — запи� кешу буде втрачено "
 "під ча� на�тупного запу�ку програми\n"
 
-#: dirmngr/crlcache.c:2496
+#: dirmngr/crlcache.c:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "Початок дампу CRL (отримано за допомогою %s)\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 msgid ""
 " ERROR: The CRL will not be used because it was still too old after an "
 "update!\n"
@@ -10302,54 +10309,54 @@ msgstr ""
 " ПОМИЛК�: CRL не буде викори�тано, о�кільки він в�е ще за�тарілий пі�л� "
 "оновленн�!\n"
 
-#: dirmngr/crlcache.c:2522
+#: dirmngr/crlcache.c:2523
 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:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr " ПОМИЛК�: CRL не буде викори�тано\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " ПОМИЛК�: цей кешований CRL можливо було підроблено!\n"
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " УВ�Г�: некоректна довжина запи�у кешу\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2558
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "проблема під ча� читанн� запи�у кешу: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2569
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "проблема під ча� �проби читанн� ключа кешу: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2600
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "помилка під ча� �проби читанн� запи�у кешу з бази даних: %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2603
 msgid "End CRL dump\n"
 msgstr "Кінець дампу CRL\n"
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "помилка crl_fetch за DP: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "помилка crl_cache_insert за DP: %s\n"
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "помилка crl_cache_insert за видавцем: %s\n"
@@ -10698,12 +10705,12 @@ msgstr "викори�танн�: %s [параметри]"
 msgid "colons are not allowed in the socket name\n"
 msgstr "не можна викори�товувати двокрапки у назві �окета\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "помилка під ча� �проби отриманн� CRL з «%s»: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "помилка під ча� обробки CRL з «%s»: %s\n"
@@ -10951,91 +10958,91 @@ msgstr "�проба хешуванн� відповіді OCSP дл� «%s» з
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "не підпи�ано типовим �ертифікатом підпи�увальника OCSP"
 
-#: dirmngr/ocsp.c:582
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "�проба розміщенн� пункту �пи�ку у пам’�ті зазнала невдачі: %s\n"
 
-#: dirmngr/ocsp.c:598 dirmngr/ocsp.c:782
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "помилка під ча� �проби отриманн� ідентифікатора відповідача: %s\n"
 
-#: dirmngr/ocsp.c:642
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "не ви�влено придатного �ертифіката дл� перевірки відповіді за OCSP\n"
 
-#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "не ви�влено �ертифіката видавц�: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "викликаною підпрограмою не повернуто �ертифіката призначенн�\n"
 
-#: dirmngr/ocsp.c:698
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "викликаною підпрограмою не повернуто �ертифіката видавц�\n"
 
-#: dirmngr/ocsp.c:708
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "не вдало�� розмі�тити контек�т OCSP: %s\n"
 
-#: dirmngr/ocsp.c:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "не визначено типового відповідача за OCSP\n"
 
-#: dirmngr/ocsp.c:753
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "не визначено типового підпи�увача за OCSP\n"
 
-#: dirmngr/ocsp.c:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "викори�товуємо типовий відповідач за OCSP «%s»\n"
 
-#: dirmngr/ocsp.c:765
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "викори�товуємо відповідач за OCSP «%s»\n"
 
-#: dirmngr/ocsp.c:822
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "помилка під ча� отриманн� �тану OCSP дл� �ертифіката призначенн�: %s\n"
 
-#: dirmngr/ocsp.c:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "�тан �ертифіката: %s  (цей=%s  на�тупний=%s)\n"
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "придатний"
 
-#: dirmngr/ocsp.c:854
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "�ертифікат було відкликано: %s причина: %s\n"
 
-#: dirmngr/ocsp.c:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "Відповідачем OCSP повернуто �тан у майбутньому\n"
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "Відповідачем OCSP повернуто не поточний �тан\n"
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "Відповідачем OCSP повернуто занадто за�тарілі дані щодо �тану\n"
@@ -11049,63 +11056,63 @@ msgstr "помилка assuan_inquire(%s): %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "помилка assuan_inquire: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "помилка під ча� �проби над�иланн� даних: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "помилка start_cert_fetch: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1776
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "помилка fetch_next_cert: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "перевищено max_replies у %d\n"
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "не вдало�� розмі�тити �труктуру керуванн�: %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "не вдало�� розмі�тити контек�т assuan: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "не вдало�� ініціалізувати �ервер: %s\n"
 
-#: dirmngr/server.c:3062
+#: dirmngr/server.c:3078
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "не вдало�� зареє�трувати команди за допомогою Assuan: %s\n"
 
-#: dirmngr/server.c:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "проблема з прийн�тт�м Assuan: %s\n"
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "помилка обробки за допомогою Assuan: %s\n"
@@ -11421,90 +11428,105 @@ msgstr ""
 "Синтак�и�: gpg-check-pattern [параметри] файл_шаблонів\n"
 "Перевірити пароль, вказаний у stdin, за допомогою файла_шаблонів\n"
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: 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:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: tools/gpg-card.c:3758
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "authenticate to the card"
 msgstr "додати �ертифікат до кешу"
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "налаштуванн� KDF дл� розпізнаванн� за PIN"
 
-#: tools/gpg-card.c:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3707
+#: 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:3708
+#: 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:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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) не відповідає "
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index b10f109..2cefb2b 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a744da8..a9b76fe 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -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-10-13 16:02+0200\n"
-"PO-Revision-Date: 2022-04-14 13:13+0800\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\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"
@@ -143,8 +143,8 @@ msgstr "PIN："
 msgid "Passphrase:"
 msgstr "密�："
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "�匹� - 请�试"
 
@@ -193,24 +193,24 @@ msgstr "注�：�自网络�览器的请求。"
 msgid "Note: Request from a remote site."
 msgstr "注�：�自远程站点的请求。"
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "获��的�列�时出现错误： %s\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "请�新输入此密�"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "请输入密�以在 %s 系统内部�护已导入的对象。"
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -221,25 +221,25 @@ msgstr "此密钥（或�密钥）未�密��护。请输入新的密�以
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "无法打开 ‘%s’： %s\n"
@@ -249,32 +249,32 @@ msgstr "无法打开 ‘%s’： %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "没有找到�适的�片密钥：%s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "获��片列表时出现错误：%s\n"
 
-#: agent/command-ssh.c:2777
+#: agent/command-ssh.c:2782
 #, 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:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr "�许"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr "拒�"
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -283,7 +283,7 @@ msgstr ""
 "请输入一个密�，以便于在 gpg-agent 的密钥存储中�护接收到的�钥 %%0A   %s"
 "%%0A   %s%%0A"
 
-#: agent/command-ssh.c:3797
+#: agent/command-ssh.c:3837
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "从以下套接字创建�时失败： %s\n"
@@ -340,10 +340,9 @@ 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"
+#, c-format
 msgid "error writing to pipe: %s\n"
-msgstr "写入 %s 时出现错误：%s\n"
+msgstr "写入管�时出现错误：%s\n"
 
 #: agent/genkey.c:176
 msgid "Enter new passphrase"
@@ -403,194 +402,200 @@ msgstr "请输入密�以%0A�护您的新密钥"
 msgid "Please enter the new passphrase"
 msgstr "请输入新的密�"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 msgid "Options used for startup"
 msgstr "用于�动的选项"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr "以守护进程模��行 （��）"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr "以�务进程模��行 （��）"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "请勿离开控制�"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr "sh 风格的命令行输出"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr "csh 风格的命令行输出"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|从 FILE 中读�选项"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr "控制诊断输出的选项"
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "详细模�"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "尽��少�示信�"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|将�务器模�的日志写入到 FILE"
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr "控制�置的选项"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 msgid "do not use the SCdaemon"
 msgstr "�使用 SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|使用 PGM 作为 SCdaemon 程�"
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|使用 PGM 作为 tpm2daemon 程�"
 
-#: agent/gpg-agent.c:215
+#: agent/gpg-agent.c:216
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|通过 NAME 接收一些命令"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr "忽略改� TTY 的请求"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr "忽略改� X display 的请求"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 msgid "enable ssh support"
 msgstr "�用 ssh 支�"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|使用 ALGO 显示 ssh 指纹"
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 msgid "enable putty support"
 msgstr "�用 putty 支�"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "�用 putty 支�"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "控制安全的选项"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|使被缓存的 PIN 在 N 秒�过期"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|在 N 秒�使 SSH 密钥过期"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|设置 PIN 缓存的生命周期为 N 秒"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|设置 SSH 缓存的生命周期为 N 秒"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr "在签�时�使用 PIN 缓存"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 msgid "disallow the use of an external password cache"
 msgstr "�止使用外部的密�缓存"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "�止客户端将密钥标记为“信任�"
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 msgid "allow presetting passphrase"
 msgstr "�许预设置的密�"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr "选项强制�求一个密�策略"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr "��许绕过密�的策略"
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|设置�求新密�的最短长度为 N"
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|�求新密�至少有 N 个�字�字符"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|按 FILE 中的样�检查新密�"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|在 N 天�使密�过期"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 msgid "do not allow the reuse of old passphrases"
 msgstr "��许�次使用旧的密�"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 msgid "Options controlling the PIN-Entry"
 msgstr "控制 PIN-Entry 的选项"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 msgid "never use the PIN-entry"
 msgstr "�使用 PIN-entry"
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr "�止调用者覆盖 pinentry"
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "�许 PIN-Entry 抓�键盘与鼠标"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|使用 PGM 作为 PIN-Entry 程�"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|设置 Pinentry 的超时时间为 N 秒"
 
-#: agent/gpg-agent.c:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: tools/gpg-connect-agent.c:225 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
@@ -599,11 +604,11 @@ msgstr ""
 "请� <@EMAIL@> 报告程�缺陷。\n"
 "请� <i18n-zh@googlegroups.com> 邮件列表�映简体中文的翻译问题或建议。\n"
 
-#: agent/gpg-agent.c:570
+#: agent/gpg-agent.c:582
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "用法： @GPG_AGENT@ [选项] （-h 获�帮助）"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -611,135 +616,135 @@ msgstr ""
 "语法： @GPG_AGENT@ [选项] [命令 [�数]]\n"
 "@GNUPG@ �钥管�器\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "无效的调试级别‘%s’\n"
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "从‘%s’读�选项\n"
 
-#: agent/gpg-agent.c:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告：“%s� 是一个已被弃用的选项\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法创建套接字： %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "套接字�称‘%s’太长\n"
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "正�试从�行的 %s 处夺�套接字\n"
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "有一个 gpg-agent 实例正在�行 - 无须�动新的实例\n"
 
-#: agent/gpg-agent.c:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "获�套接字 nonce 时出现错误\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "绑定套接字到 '%s' 时出现错误： %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "无法设置‘%s’的��： %s\n"
 
-#: agent/gpg-agent.c:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "正在监�套接字‘%s’\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "无法创建目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "目录‘%s’已创建\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "‘%s’的 stat() 方法失败：%s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "无法使用‘%s’作为家目录\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "在读� fd %d 上的 nonce 时出现错误： %s\n"
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "�柄 0x%lx 于文件�述符 %d �动\n"
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "�柄 0x%lx 于文件�述符 %d 终止\n"
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh �柄 0x%lx 于文件�述符 %d �动\n"
 
-#: agent/gpg-agent.c:2853
+#: agent/gpg-agent.c:2967
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh �柄 0x%lx 于文件�述符 %d 终止\n"
 
-#: agent/gpg-agent.c:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect 方法失败：%s - 等待 1s\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已�止\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -949,12 +954,9 @@ msgid "Please insert the card with serial number"
 msgstr "请�入具有以下�列�的�"
 
 #: agent/findkey.c:1231
-#, fuzzy, c-format
-#| msgid ""
-#| "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want "
-#| "to allow this?"
+#, c-format
 msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
-msgstr "一个 ssh 进程请求使用密钥%%0A  %s%%0A  (%s)%%0A您想��许这一请求�？"
+msgstr "请求使用密钥%%0A  %s%%0A  %s%%0A您想��许这一请求�？"
 
 #: agent/findkey.c:1737
 #, c-format
@@ -1002,7 +1004,7 @@ msgstr "检查已建立的签�时�生错误： %s\n"
 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:1602
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "�支�的公钥算法: %d (%s)\n"
@@ -1017,52 +1019,52 @@ msgstr "�支�的�护算法: %d (%s)\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1092,18 +1094,18 @@ msgstr "警告： %s 具有�安全的文件所有� “%s�\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告：%s 具有�安全的文件��� “%s�\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "等待 ‘%s’ �被访问...\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "yes"
 
@@ -1160,8 +1162,8 @@ msgstr "分� %lu 字节时安全内存�足"
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "在分�足够的内存时出现错误： %s\n"
@@ -1181,67 +1183,67 @@ msgstr "警告： “%s%s� 是一个废弃的选项 - 此选项�会产生作
 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:432 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"
@@ -1389,11 +1391,11 @@ msgstr "�书链�有效"
 msgid "Root certificate trustworthy"
 msgstr "根�书��"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 msgid "no CRL found for certificate"
 msgstr "未找到该�书的�书�销列表（CRL）"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 msgid "the available CRL is too old"
 msgstr "�用的�书�销列表（CRL）太旧"
 
@@ -1430,7 +1432,7 @@ msgstr "没有关于 ‘%s’ 的�用帮助。"
 msgid "ignoring garbage line"
 msgstr "忽略无用行"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "[none]"
 msgstr "[未有]"
 
@@ -1474,36 +1476,36 @@ msgstr "iconv_open 方法失败： %s\n"
 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
 #, 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"
@@ -1513,136 +1515,136 @@ msgstr "等待� %s...\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太旧 （需� %s，拥有 %s）\n"
 
-#: g10/armor.c:441
+#: 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:1462
+#: g10/build-packet.c:1480
 #, c-format
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "[ �人类�读（%zu 字节：%s%s） ]"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "一个记�的�称必须��有�打�字符或者空格，并且以一个‘=’结尾\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "一个用户记��称必须包�‘@’字符\n"
 
-#: g10/build-packet.c:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "一个记��称必须�包�多于一个的‘@’字符\n"
 
-#: g10/build-packet.c:1550
+#: g10/build-packet.c:1568
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "一个记�的值必须�能使用任何的控制字符\n"
 
-#: g10/build-packet.c:1606
+#: g10/build-packet.c:1624
 #, c-format
 msgid "a notation name may not contain an '=' character\n"
 msgstr "一个记�的�称�能�能包�‘=’字符\n"
 
-#: g10/build-packet.c:1612
+#: g10/build-packet.c:1630
 #, c-format
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr "一个记�的�称必须��有�打�字符或者空格\n"
 
-#: g10/build-packet.c:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "警告： 找到的记�数�无效\n"
@@ -1656,7 +1658,7 @@ msgstr "代� %s 到客户端的查询失败\n"
 msgid "Enter passphrase: "
 msgstr "输入密�： "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 g10/sign.c:473
 #: sm/call-agent.c:180 sm/encrypt.c:702 sm/sign.c:436
 #, c-format
 msgid "%s is not compliant with %s mode\n"
@@ -1673,7 +1675,7 @@ msgstr "�自 TPM 的错误：%s\n"
 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:2330
+#: 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 ""
@@ -1713,169 +1715,169 @@ msgstr "已清除�自�务器的��接�的 HTTP �定�"
 msgid "server uses an invalid certificate"
 msgstr "�务器�书无效"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "您的选择是？ "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr "先生"
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr "女士"
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "�强制"
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "强制"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 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:1500
+#: g10/card-util.c:803 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:1502
+#: g10/card-util.c:805 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "错误：��许出现两个空格。\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "�片�有人的姓： "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "�片�有人的�： "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "登录数�（�户�）： "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "个人 DO 数�： "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "语言�好： "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 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:1800
+#: g10/card-util.c:1199 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "错误：无效的�应。\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "CA 指纹： "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "错误：指纹格�无效。\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1296
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "密钥�作无法实现：%s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1297
 msgid "not an OpenPGP card"
 msgstr "�是一个 OpenPGP �"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�得当�密钥信�时出错：%s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1395
 msgid "Replace existing key? (y/N) "
 msgstr "替�现存的密钥？(y/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 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"
@@ -1886,100 +1888,100 @@ msgstr ""
 "      如果密钥生���功，请检查您的�片文档，\n"
 "      查看其所支�的密钥类型和大�。\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 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:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr "正在改��片的密钥属性： "
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 msgid "Signature key\n"
 msgstr "签�密钥\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 msgid "Encryption key\n"
 msgstr "加密密钥\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 msgid "Authentication key\n"
 msgstr "身份验�密钥\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "注�： 已有�钥被存储于�片上�\n"
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2429
+#: g10/card-util.c:1694 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "替�现存的密钥？(y/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1990,176 +1992,176 @@ msgstr ""
 "  PIN = ‘%s’    管�员 PIN = ‘%s’\n"
 "您应当使用 --change-pin 命令�更改它们\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 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:1743 g10/card-util.c:1833
 msgid "   (1) Signature key\n"
 msgstr "  (1) 签�密钥\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1744 g10/card-util.c:1835
 msgid "   (2) Encryption key\n"
 msgstr "  (2) 加密密钥\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr "  (3) 身份验�密钥\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 msgid "Please select where to store the key:\n"
 msgstr "请选择在哪里存储密钥：\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1876
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD 失败： %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "真的�执行��出厂设置�？ (输入“yes�) "
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, c-format
 msgid "error for setup KDF: %s\n"
 msgstr "设置 KDF 时出现错误： %s\n"
 
-#: g10/card-util.c:2229
+#: g10/card-util.c:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "退出此��"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr "显示管�员命令"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "显示此帮助"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "列出所有�用数�"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "更改��有人的姓�"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "更改拉�密钥的 URL"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3689
+#: g10/card-util.c:2262 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:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "更改登录�"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "更改语言�好"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 tools/gpg-card.c:3750
 msgid "change card holder's salutation"
 msgstr "�更�片�有人的称呼"
 
-#: g10/card-util.c:2268 tools/gpg-card.c:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "更改一个 CA 指纹"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "切�签�强制使用 PIN 标志"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "生�新的密钥"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "更改或解� PIN 的��"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3698
+#: g10/card-util.c:2271 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "验� PIN 并列出所有数�"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "使用�置�解� PIN"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr "销�所有密钥和数�"
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 msgid "setup KDF for PIN authentication (on/single/off)"
 msgstr "针对 PIN 身份验�设置 KDF（开�/�一/关闭）"
 
-#: g10/card-util.c:2277
+#: g10/card-util.c:2276
 msgid "change the key attribute"
 msgstr "更改密钥属性"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 tools/gpg-card.c:3763
 msgid "change the User Interaction Flag"
 msgstr "�更用户交互选项"
 
-#: g10/card-util.c:2402 tools/gpg-card.c:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 msgid "Admin-only command\n"
 msgstr "仅供管�员使用的命令\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr "管�员命令�用\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 msgid "Admin commands are not allowed\n"
 msgstr "管�员命令��用\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的命令  （�试“help�）\n"
 
-#: g10/decrypt.c:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中�起作用\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2217,9 +2219,9 @@ msgstr "密钥"
 msgid "subkey"
 msgstr "�密钥"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失败：%s\n"
@@ -2250,18 +2252,18 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告： 强制对称密文 %s (%d) 与接收者的�好设置冲�\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, c-format
 msgid "cipher algorithm '%s' may not be used for encryption\n"
 msgstr "密文算法 ‘%s’ �能�能被用于加密\n"
 
-#: g10/encrypt.c:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr "（使用选项 “%s� �覆盖）\n"
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "密文算法 ‘%s’ �能�能被用于 %s 模�\n"
@@ -2271,64 +2273,64 @@ msgstr "密文算法 ‘%s’ �能�能被用于 %s 模�\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "警告： 密钥 %s 在 %s 模�下�适用于加密\n"
 
-#: g10/encrypt.c:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "创建密�时出现错误：%s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, c-format
 msgid "using cipher %s.%s\n"
 msgstr "使用加密 %s.%s\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "‘%s’已被压缩\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "警告：‘%s’是一个空文件\n"
 
-#: g10/encrypt.c:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 sm/sign.c:597 sm/verify.c:510
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "摘�算法‘%s’�能在 %s 模�下使用\n"
 
-#: g10/encrypt.c:862
+#: g10/encrypt.c:853
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "正在从‘%s’读�\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告： 强制压缩算法 %s (%d) 与接收者的�好设置冲�\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, c-format
 msgid "%s/%s.%s encrypted for: \"%s\"\n"
 msgstr "%s/%s.%s 已�加密给：“%s�\n"
 
-#: g10/encrypt.c:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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
@@ -2346,61 +2348,73 @@ msgstr "警告： 消�使用了一个弱密钥以对称密文的形�加密\n
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "警告：没有导出任何东西\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2464,7 +2478,7 @@ msgstr "无效的密钥 %s 通过 --allow-non-selfsigned-uid 生效\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用�密钥 %s 而�主密钥 %s\n"
 
-#: g10/getkey.c:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "选项 ‘%s’ 的有效值:\n"
@@ -2537,111 +2551,111 @@ msgstr "快速�销一个用户标识"
 msgid "quickly set a new expiration date"
 msgstr "快速设置一个过期日期"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr "完整功能的密钥对生�"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "生�一份�销�书"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "从�钥钥匙环里删除密钥"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "quickly sign a key"
 msgstr "快速签�一个密钥"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 msgid "quickly sign a key locally"
 msgstr "快速本地签�一个密钥"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "quickly revoke a key signature"
 msgstr "快速�销一个密钥签�"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "签�一个密钥"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "本地签�一个密钥"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "签�或编辑一个密钥"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "更改密�"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "将密钥导出到一个公钥�务器上"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "从公钥�务器上导入密钥"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "在公钥�务器上�索密钥"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "从公钥�务器更新所有密钥"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "导入/�并密钥"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr "打��片状�"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr "更改�片上的数�"
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr "更改�片的 PIN"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "更新信任数�库"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 msgid "print message digests"
 msgstr "打�消�摘�"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "以�务器模��行"
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|设置一个密钥的 TOFU 政策"
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|使用 NAME 作为默认的�钥"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|�时给以 NAME 为�称的用户标识加密"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|设置电�邮件别�"
 
@@ -2657,51 +2671,51 @@ msgstr "��任何更改"
 msgid "prompt before overwriting"
 msgstr "覆盖��示"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr "控制输入的选项"
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr "控制输出的选项"
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "创建 ASCII 字符�装的输出"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|写输出到 FILE"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "使用规范的文本模�"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|设置压缩等级为 N （0 为�用）"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr "控制密钥导入导出的选项"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|通过邮件地�定�密钥时使用机制 MECHANISMS"
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 msgid "import missing key from a signature"
 msgstr "从签�中导入缺少的密钥"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 msgid "include the public key in signatures"
 msgstr "在签�中包�公钥"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "�用对 dirmngr 的所有访问"
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr "控制密钥列表的选项"
 
@@ -2725,7 +2739,7 @@ msgstr "用于无人值守的选项"
 msgid "Other options"
 msgstr "其他选项"
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2733,7 +2747,7 @@ msgstr ""
 "@\n"
 "（请�考手册页以获得所有命令和选项的完整列表）\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2753,11 +2767,11 @@ msgstr ""
 " --list-keys [�字]        列出密钥\n"
 " --fingerprint [�字]      显示指纹\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "用法： @GPG@ [选项] [文件] (-h 获�帮助)"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1172
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2767,7 +2781,7 @@ msgstr ""
 "签��检查�加密或解密\n"
 "默认的�作�输入数�而定\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2775,554 +2789,545 @@ msgstr ""
 "\n"
 "支�的算法：\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "公钥： "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "密文： "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "散列： "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "压缩：  "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "用法： %s [选项] %s\n"
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "冲�的指令\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "群组定义 ‘%s’ 中找�到 = 标志\n"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1698
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的所有��安全\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "警告：�置文件‘%s’的所有��安全\n"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "警告：扩展模�‘%s’的所有��安全\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的����安全\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "警告：�置文件‘%s’的����安全\n"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "警告：扩展模�‘%s’的����安全\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的上级目录所有��安全\n"
 
-#: g10/gpg.c:1735
+#: g10/gpg.c:1725
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "警告：�置文件‘%s’的上级目录所有��安全\n"
 
-#: g10/gpg.c:1738
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "警告：扩展模�‘%s’的上级目录所有��安全\n"
 
-#: g10/gpg.c:1744
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的上级目录����安全\n"
 
-#: g10/gpg.c:1747
+#: g10/gpg.c:1737
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "警告：�置文件‘%s’的上级目录���安全\n"
 
-#: g10/gpg.c:1750
+#: g10/gpg.c:1740
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "警告：扩展模�‘%s’的上级目录����安全\n"
 
-#: g10/gpg.c:1966
+#: g10/gpg.c:1956
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "未知的�置项‘%s’\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示照片标识"
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 msgid "show key usage information during key listings"
 msgstr "列出密钥时显示用途信�"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr "列出签�时显示策略 URL"
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 msgid "show all notations during signature listings"
 msgstr "列出签�时显示所有注记"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签�时显示 IETF 标准注记"
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签�时显示用户�供的注记"
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出签�时显示首选公钥�务器 URL"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已�销或已过期的用户标识"
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已�销或已过期的�密钥"
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的�称"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 msgid "show expiration dates during signature listings"
 msgstr "列出签�时显示过期日期"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "列出�好设置（专家模�）"
+
+#: g10/gpg.c:2197
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "未知的 TOFU 政策‘%s’\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "（使用“help��列出选择）\n"
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "��许在 %s 模�中使用此命令。\n"
 
-#: g10/gpg.c:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "注�：%s �适用于一般使用�\n"
 
-#: g10/gpg.c:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’�是一个有效的签�过期日期\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s� �是一个�适的邮件地�\n"
 
-#: g10/gpg.c:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "无效的 pinentry 模�‘%s’\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "无效的请求��‘%s’\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’�是一个有效的字符集\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "无法解�公钥�务器 URL\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥�务器选项\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥�务器选项\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "无效的过滤选项：%s\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr "验�签�时显示照片标识"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr "验�签�时显示策略 URL"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 msgid "show all notations during signature verification"
 msgstr "验�签�时显示所有注记"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr "验�签�时显示 IETF 标准注记"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr "验�签�时显示用户�供的注记"
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验�签�时显示首选公钥�务器 URL"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 msgid "show user ID validity during signature verification"
 msgstr "验�签�时显示用户标识的有效性"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验�密钥时显示已�销或已过期的�钥"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 msgid "show only the primary user ID in signature verification"
 msgstr "在签�验�中�显示主�用户标识"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 无效的验�选项\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr "无效的验�选项\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法设置�行路径为 %s\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s%d: 无效的 auto-key-locate 列表\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 列表\n"
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "选项 “%.50s� 的�数无效\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程��能会创建核心内存转储文件�\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 覆盖了 %s \n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ��许与 %s 并用\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用时�起作用\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "警告：正在以虚�的系统时间�行： "
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "�会在内存�安全的情况下�行，原因是 %s\n"
 
-#: g10/gpg.c:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的密文算法无效\n"
 
-#: g10/gpg.c:3952
-#, c-format
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "所选择的 AEAD 算法无效\n"
-
-#: g10/gpg.c:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的�书散列算法无效\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "需�的完全�信签�数一定�大于 0\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需�的勉强�信签�数一定�大于 1\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注�：强烈�建议使用简�的 S2K 模� (0)\n"
 
-#: g10/gpg.c:4001
+#: g10/gpg.c:3964
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模�；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "无效的默认�好设置\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人密文�好设置\n"
 
-#: g10/gpg.c:4015
-#, c-format
-msgid "invalid personal AEAD preferences\n"
-msgstr "无效的个人 AEAD �好设置\n"
-
-#: g10/gpg.c:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人摘�算法�好设置\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "�大�无效 - 使用 %d\n"
 
-#: g10/gpg.c:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚�能和 %s 并用\n"
 
-#: g10/gpg.c:4137
-#, c-format
-msgid "AEAD algorithm '%s' may not be used in %s mode\n"
-msgstr "AEAD 算法‘%s’�能在 %s 模�下使用\n"
-
-#: g10/gpg.c:4149
+#: g10/gpg.c:4097
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "压缩算法‘%s’�能在 %s 模�下使用\n"
 
-#: g10/gpg.c:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�始化信任度数�库失败：%s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了接收者（-r）但并未使用公钥加密\n"
 
-#: g10/gpg.c:4388
+#: g10/gpg.c:4336
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "您�能在使用 --symmetric --encrypt 时使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:4420
+#: g10/gpg.c:4368
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "您�能在 %s 模�下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4426
 #, 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:4481
+#: g10/gpg.c:4429
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "您�能在 %s 模�下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "��至公钥�务器失败：%s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥�务器接收失败：%s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "作为 ssh 密钥导出失败：%s\n"
 
-#: g10/gpg.c:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "公钥�务器�索失败：%s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "公钥�务器刷新失败：%s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开字符�装时失败：%s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行字符�装时失败：%s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "无效的散列算法‘%s’\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "解�密钥指定‘%s’时出现错误：%s\n"
 
-#: g10/gpg.c:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "‘%s’��是一个有效的密钥标识�指纹或者 keygrip\n"
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "警告：没有�供命令。正在�试猜测您的�图...\n"
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始输入您的消�…\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的�书策略 URL 无效\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签�策略 URL 无效\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥�务器 URL 无效\n"
@@ -3335,7 +3340,7 @@ msgstr "|FILE|从钥匙环 FILE 文件中�得密钥"
 msgid "make timestamp conflicts only a warning"
 msgstr "把时间戳冲�仅视为警告"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状�信�写入文件�述符 FD"
 
@@ -3364,153 +3369,153 @@ msgstr "没有�用的帮助"
 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"
@@ -3519,171 +3524,171 @@ msgstr ""
 "警告：密钥 %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:1998 g10/import.c:3146
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "密钥 %s：没有用户标识\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, c-format
 msgid "key %s: %s\n"
 msgstr "密钥 %s： %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr "被导入筛查器拒�"
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "密钥%s：PKS �密钥破�已修�\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2075
 #, 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:2086 g10/import.c:2117
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2088
 #, 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:2167 g10/import.c:3533
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "密钥 %s：找�到公钥：%s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2173
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "密钥 %s：新密钥 - 已跳过\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "写入钥匙环 ‘%s’ 时出现错误： %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2240
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "密钥 %s：公钥 “%s� 已导入\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2267
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "密钥 %s：与我们的副本�符�\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2335
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "密钥 %s：“%s� 1 个新的用户标识\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2338
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "密钥 %s：“%s� %d 个新的用户标识\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2341
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "密钥 %s：“%s� 1 个新的签�\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2344
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "密钥 %s：“%s� %d 个新的签�\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2347
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "密钥 %s：“%s� 1 个新的�密钥\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "密钥 %s：“%s� %d 个新的�密钥\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "密钥 %s：“%s� %d 个签�被清�\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "密钥 %s：“%s� %d 个签�被清�\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "密钥 %s：“%s� %d 个用户标识被清�\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "密钥 %s：“%s� %d 个用户标识被清�\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2398
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "密钥 %s：“%s� 未改�\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2785 g10/import.c:2980
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "密钥 %s：�钥已导入\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "密钥 %s：�钥已存在\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2801
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "密钥 %s：��至代�人程�时出现错误：%s\n"
@@ -3696,197 +3701,197 @@ msgstr "密钥 %s：��至代�人程�时出现错误：%s\n"
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "��移 ‘%s’，对�一张智能�，执行：%s\n"
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "�钥 %s：%s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3138 g10/import.c:3177
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "�钥导入被�止\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "用户标识��有效"
 
-#: g10/import.c:3387 g10/keylist.c:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "�销原因： "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "�销注释： "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "密钥 %s：没有公钥 - 无法应用�销�书\n"
 
-#: g10/import.c:3485
+#: g10/import.c:3555
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "密钥 %s：无法定�原始的密钥区�：%s\n"
 
-#: g10/import.c:3492
+#: g10/import.c:3562
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "密钥 %s：无法读�原始的密钥区�：%s\n"
 
-#: g10/import.c:3512
+#: g10/import.c:3582
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "密钥 %s：无效的�销�书：%s - 已拒�\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "密钥 %s：“%s� �销�书已被导入\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3703
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "密钥 %s：签�没有用户标识\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "密钥 %s：�支�的公钥算法\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "密钥 %s：无效的直接密钥签�\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "密钥 %s：没有�供绑定的�密钥\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3769
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "密钥 %s：无效的�密钥绑定\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3788
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "密钥 %s：已删除多��密钥绑定\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3812
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "密钥 %s：没有用于密钥�销用的�密钥\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "密钥 %s：无效的�密钥�销\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3840
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "密钥 %s：已删除多��密钥�销\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3887
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "密钥 %s：已跳过用户标识 “%s�\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "密钥 %s：已跳过�密钥\n"
 
-#: g10/import.c:3873
+#: g10/import.c:3946
 #, 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:3957
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "密钥 %s：�销�书�置错误――已跳过\n"
 
-#: g10/import.c:3902
+#: g10/import.c:3985
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "密钥 %s：无效的�销�书：%s――已跳过\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4009
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "密钥 %s：�钥签��置错误 - 已跳过\n"
 
-#: g10/import.c:3924
+#: g10/import.c:4017
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "密钥 %s：与预期�符的签�级别（0x%02X） - 已跳过\n"
 
-#: g10/import.c:4097
+#: g10/import.c:4190
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "密钥 %s：检测到��的用户标识 - 已�并\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4297
 #, c-format
 msgid "key %s: duplicated subkeys detected - merged\n"
 msgstr "密钥 %s：检测到��的�钥 - 已�并\n"
 
-#: g10/import.c:4269
+#: g10/import.c:4362
 #, 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:4378
 #, 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:4444
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "密钥 %s：已添加�销�书 “%s�\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4482
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "密钥 %s：已添加直接密钥签�\n"
@@ -3922,13 +3927,13 @@ msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "%d 个��签�被移除\n"
 
-#: g10/key-check.c:726 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"
 msgstr[0] "%d 个签�因密钥�失而未被检查\n"
 
-#: g10/key-check.c:734 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"
@@ -3977,15 +3982,15 @@ msgstr "密钥区�资�‘%s’：%s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "�新建立钥匙环缓存失败： %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[revocation]"
 msgstr "[�销]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[自签�]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -3995,17 +4000,17 @@ msgstr ""
 "请决定您对这�用户能�正确地验�其他用户密钥\n"
 "（通过查看护照，检查����的的指纹等等）的相信程度\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 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:390 g10/pkclist.c:291
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全相信\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:408
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4015,50 +4020,50 @@ msgstr ""
 "深度若大于 1 您将签�的这个密钥将�以\n"
 "代表您进行信任签�。\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:425
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "请输入一个�制此签�的域，如果没有请按回车。\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr "跳过用户标识 “%s�，其�是一个文字标识。\n"
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  无法添加签�。\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "用户标识 “%s� 已过期。"
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "警告：用户标识 “%s� ��自签�。"
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "用户标识 “%s� �被签�。 "
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr "为其签��？(y/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4067,65 +4072,65 @@ msgstr ""
 "“%s� 上的自签�是\n"
 "PGP 2.x 样�的签�。\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "has expired.\n"
 msgstr "您当�在 “%s� 上的签�已过期。\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
 "is a local signature.\n"
 msgstr "您目�为 “%s� 的签�是一个本地签�。\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "您是�想�把它�级�一个�完整导出的签�？(y/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:748
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "“%s� 已由密钥 %s 在本地签�\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "“%s� 已由密钥 %s 签�\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:758
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "您无论如何都�为它�次签��？(y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "没有东西�以用密钥 %s 签�\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:804
 msgid "This key has expired!"
 msgstr "这个密钥已过期�"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "这个密钥将在 %s 过期。\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "您想�让您的签�也在�一时间过期�？ (Y/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4134,31 +4139,31 @@ msgstr ""
 "您有多仔细地检查过您正�签�的密钥确实属于具有以上�字的人呢？\n"
 "如果您�知�这个问题的答案，请输入“0�。\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 我�作答。 %s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 我根本没有检查过。 %s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 我��检查过。 %s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:881
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) 我�常�心地检查过。 %s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:888
 msgid "Your selection? (enter '?' for more information): "
 msgstr "您的选择是？（输入‘?’以获得更多的信�）： "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4167,226 +4172,226 @@ msgstr ""
 "您真的确定�签�这个密钥，使用您的密钥\n"
 "“%s� (%s)\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 msgid "This will be a self-signature.\n"
 msgstr "这将会是一个自签�。\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告：这份签�将�会被标记为��导出。\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告：这份签�将�会被标记����销。\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:945
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "这份签�将会被标记���导出。\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:952
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "这份签�将会被标记����销。\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "I have not checked this key at all.\n"
 msgstr "我根本没有检查过这个密钥。\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 msgid "I have checked this key casually.\n"
 msgstr "我��检查过这个密钥。\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 msgid "I have checked this key very carefully.\n"
 msgstr "我�常�心地检查过这个密钥。\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:981
 msgid "Really sign? (y/N) "
 msgstr "真的�签��？(y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签�时失败： %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "密钥�有存根或者�上项目 - 没有密��以更改。\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1152
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "密钥 %s：修改密�时出现错误：%s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "save and quit"
 msgstr "�存并退出"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 msgid "show key fingerprint"
 msgstr "显示密钥指纹"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 msgid "show the keygrip"
 msgstr "显示 keygrip"
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "列出密钥和用户标识"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "选择用户标识 N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr "选择�密钥 N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr "检查签�"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "为所选用户标识添加签� [* ��下�的相关命令]"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "sign selected user IDs locally"
 msgstr "为所选用户标识添加本地签�"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 msgid "sign selected user IDs with a trust signature"
 msgstr "为所选用户标识添加信任签�"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "为所选用户标识添加���销签�"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "add a user ID"
 msgstr "增加一个用户标识"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "增加一个照片标识"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr "删除选定的用户标识"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr "增加一个�密钥"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr "增加一个密钥到智能�"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr "移动一个密钥到智能�"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr "使用本地 TPM 将密钥转�为 TPM 形�"
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr "移动一个备份密钥到智能�上"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 msgid "delete selected subkeys"
 msgstr "删除选定的�密钥"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "增加一个�销用密钥"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 msgid "delete signatures from the selected user IDs"
 msgstr "从所选用户标识上删除签�"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1314
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "�更密钥或所选�密钥的使用期�"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1316
 msgid "flag the selected user ID as primary"
 msgstr "标记所选的用户标识为主�"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "列出�好设置（专家模�）"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "列出�好设置（详细模�）"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 msgid "set preference list for the selected user IDs"
 msgstr "为所选用户标识设定�好设置列表"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1325
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "为所选用户标识设定首选公钥�务器 URL"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1327
 msgid "set a notation for the selected user IDs"
 msgstr "为所选用户标识的设定注记"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1329
 msgid "change the passphrase"
 msgstr "�更密�"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "�更信任度"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 msgid "revoke signatures on the selected user IDs"
 msgstr "�销所选用户标识上的签�"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 msgid "revoke selected user IDs"
 msgstr "�销选定的用户标识"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "revoke key or selected subkeys"
 msgstr "�销密钥或选定的�密钥"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "enable key"
 msgstr "�用密钥"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr "�用密钥"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr "显示选定的照片标识"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "压缩��用的用户标识并从密钥上移除��用的签�"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1349
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "压缩��用的用户标识并从密钥上移除所有签�"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1470
 msgid "Secret key is available.\n"
 msgstr "�钥�用。\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 msgid "Secret subkeys are available.\n"
 msgstr "�密�密钥�用。\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1574
 msgid "Need the secret key to do this.\n"
 msgstr "�有�钥�能这么�。\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4397,299 +4402,283 @@ msgstr ""
 "  信任签�，‘nr’�缀（nrsign）进行���销签�，\n"
 "  或者上述三��缀的任�组�（ltsign�tnrsign 等）。\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "密钥已被�销。"
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 msgid "Really sign all text user IDs? (y/N) "
 msgstr "真的�签�所有的文本用户标识�？(y/N) "
 
-#: g10/keyedit.c:1681
+#: g10/keyedit.c:1682
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的�签�所有的用户标识�？(y/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1690
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "�示：选择用户标识以签�\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr "（使用‘%s’ 命令。)\n"
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 msgid "You can't delete the last user ID!\n"
 msgstr "您�能删除最�一个用户标识�\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1755
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的�移除所有选定的用户标识�？(y/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 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:1814 g10/keyedit.c:1854
 msgid "Really move the primary key? (y/N) "
 msgstr "真的�移动主密钥�？(y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 msgid "You must select exactly one key.\n"
 msgstr "您必须选择一个密钥。\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 msgid "Command expects a filename argument\n"
 msgstr "命令需�一个文件�作为�数\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "无法打开‘%s’：%s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "从‘%s’读�备份密钥时出现错误：%s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1969
 msgid "You must select at least one key.\n"
 msgstr "您必须选择至少一个密钥。\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1975
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "您真的想�删除选定的密钥�？(y/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "您真的�删除此密钥�？(y/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2015
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的��销所有选定的用户标识�？(y/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2016
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的��销此用户标识�？(y/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2034
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "您真的��销整个密钥�？(y/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2045
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "您真的��销选定的�密钥�？(y/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2047
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "您真的��销这个�密钥�？(y/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2105
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr "在使用一个用户�供的信任度数�库时信任度�能并未被设定\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2150
 msgid "Set preference list to:\n"
 msgstr "设定�好设置列表为：\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的�更新所选用户标识的�好设置�？(y/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2159
 msgid "Really update the preferences? (y/N) "
 msgstr "真的�更新�好设置�？(y/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Save changes? (y/N) "
 msgstr "��存�更�？(y/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr "���存而退出�？(y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有�更所以�需�更新。\n"
 
-#: g10/keyedit.c:2557
+#: g10/keyedit.c:2558
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "�能�销最�一个有效的用户标识。\n"
 
-#: g10/keyedit.c:2583
+#: g10/keyedit.c:2584
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "�销用户标识时出现错误：%s\n"
 
-#: g10/keyedit.c:2646
+#: g10/keyedit.c:2647
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "设置主�用户标识时出现错误：%s\n"
 
-#: g10/keyedit.c:2677
+#: g10/keyedit.c:2717
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" �是一个指纹\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "“%s� �是主�指纹\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "无效的用户标识‘%s’：%s\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "No matching user IDs."
 msgstr "没有匹�的用户标识。"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "Nothing to sign.\n"
 msgstr "没有�被签�的东西。\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "并�由您签�。\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "�销密钥签�失败：%s\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3251
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "‘%s’�是一个有效的过期时间\n"
 
-#: g10/keyedit.c:3253
+#: g10/keyedit.c:3293
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "“%s� �是一个正确的指纹\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "�密钥 “%s� 未找到\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr "AEAD： "
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "摘�： "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "特点： "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr "公钥�务器��修改"
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "首选公钥�务器： "
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr "注记： "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "没有关于 PGP 2.x 样�用户标识的�好设置。\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3735
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "下列密钥在 %s 被 %s 的密钥 %s 所�销\n"
 
-#: g10/keyedit.c:3867
+#: g10/keyedit.c:3759
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这个密钥�被 %s 的密钥 %s �销"
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr "（�感的）"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr "�销于：%s"
 
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr "过期于：%s"
 
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr "�用于：%s"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr "��： "
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "这个密钥已�被�用"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注�，在您��程�之�，所显示的密钥有效性�一定正确。\n"
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4698,17 +4687,17 @@ msgstr ""
 "警告： 没有用户标识被标记为主�。 此命令�能会\n"
 "              导致一个��的用户标识被�定为主�。\n"
 
-#: g10/keyedit.c:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "警告： 您的加密用�密钥将在�久�过期。\n"
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "您�能也想��更它的过期日期。\n"
 
-#: g10/keyedit.c:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4717,72 +4706,70 @@ msgstr ""
 "警告：这是一个 PGP2 样�的密钥。增加照片标识�能会导致�些版本的\n"
 "     PGP 拒�这个密钥。\n"
 
-#: g10/keyedit.c:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定�然想�增加�？(y/N) "
 
-#: g10/keyedit.c:4324
+#: g10/keyedit.c:4216
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您��以把照片标识增加到 PGP2 样�的密钥里。\n"
 
-#: g10/keyedit.c:4339
-#, fuzzy
-#| msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4231
 msgid "Such a user ID already exists on this key!"
-msgstr "这样的用户标识已�存在于这个密钥上了�\n"
+msgstr "该用户标识已�存在于这个密钥上了�"
 
-#: g10/keyedit.c:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签��？(y/N/q)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签��？(y/N/q)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签��？(y/N/q)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的�删除这个自签��？(y/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "已�删除了 %d 个签�。\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "无效"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "用户标识 “%s� 已被压缩：%s\n"
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "用户标识 “%s�：%d 个签�被移除\n"
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "用户标识 “%s�：已被最�化\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "用户标识 “%s�：无用部分已清�\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4791,209 +4778,209 @@ msgstr ""
 "警告：这是一个 PGP2 样�的密钥。增加指定�销者\n"
 "     �能会导致�些版本的 PGP 无法识别这个密钥。\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您��以为 PGP 2.x 样�的密钥添加指定�销者。\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定�销者的用户标识： "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "无法将 PGP 2.x 样�的密钥设为指定�销者\n"
 
-#: g10/keyedit.c:4673
+#: g10/keyedit.c:4565
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "您�能将�把密钥设为它自己的指定�销者\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4587
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "这个密钥已被指派为一个�销者\n"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4605
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将�把密钥设置为指定�销者的�作无法撤销�\n"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4611
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定�将这个密钥设置为指定�销者�？(y/N)： "
 
-#: g10/keyedit.c:4788
+#: g10/keyedit.c:4680
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "您确定�改�多个�密钥的过期时间�？ (y/N) "
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将��更�密钥的过期时间。\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将��更主密钥的过期时间。\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您�能�更 v3 密钥的过期时间\n"
 
-#: g10/keyedit.c:4912
+#: g10/keyedit.c:4804
 msgid "Changing usage of a subkey.\n"
 msgstr "�更一个�密钥的用途。\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 msgid "Changing usage of the primary key.\n"
 msgstr "�更主密钥的用途。\n"
 
-#: g10/keyedit.c:5033
+#: g10/keyedit.c:4925
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "签�的�密钥 %s 已�交�验�\n"
 
-#: g10/keyedit.c:5039
+#: g10/keyedit.c:4931
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "�密钥 %s �签�，因此�需�被交�验�\n"
 
-#: g10/keyedit.c:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "请选定仅一个用户标识。\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识 “%s� 上的 v3 自签�\n"
 
-#: g10/keyedit.c:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选公钥�务器的 URL： "
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定�替�它�？(y/N) "
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定�删除它�？(y/N) "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 msgid "Enter the notation: "
 msgstr "输入注记： "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 msgid "Proceed? (y/N) "
 msgstr "继续？(y/N) "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有散列值为 %s 的用户标识\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "没有属于密钥标识‘%s’的�密钥。\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的�密钥\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s�\n"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签�\n"
 
-#: g10/keyedit.c:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (��导出)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "此签�已在 %s 过期。\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您�然想��销它�？(y/N) "
 
-#: g10/keyedit.c:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�为这份签�生�一份�销�书�？(y/N) "
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已�签��密钥 %s 上的这些用户标识：\n"
 
-#: g10/keyedit.c:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr " (���销)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s �销于 %s\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在�销这些签�：\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的�生��销�书�？(y/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "没有�钥\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "�试�销一个�用户标识：%s\n"
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识 “%s� 已�被�销。\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签�的日期标记为 %d 秒�的未�\n"
 
-#: g10/keyedit.c:6426
+#: g10/keyedit.c:6320
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "�能�销最�一个有效的用户标识。\n"
 
-#: g10/keyedit.c:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被�销。\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�密钥 %s 已被�销。\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 的照片标识，大� %ld，属于密钥 %s （用户标识 %d）\n"
@@ -5033,51 +5020,51 @@ msgstr "过多的 AEAD �好设置\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "首选项字符串里有无效项‘%s’\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "正在写入直接签�\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "正在写入自签�\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签�\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效；改用 %u �\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸�入到 %u 比特�\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, 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:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr "签�（Sign）"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr "认�（Certify）"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr "加密（Encrypt）"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr "身份验�（Authenticate）"
 
@@ -5091,166 +5078,166 @@ msgstr "身份验�（Authenticate）"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, c-format
 msgid "Possible actions for this %s key: "
 msgstr "%s 密钥的�实现的功能： "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr "目��用的功能： "
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 签�功能开关\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 加密功能开关\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 身份验�功能开关\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完�\n"
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, c-format
 msgid "   (%d) RSA and RSA%s\n"
 msgstr "   (%d) RSA 和 RSA %s\n"
 
-#: g10/keygen.c:2131
+#: g10/keygen.c:2108
 #, c-format
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA 和 Elgamal %s\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, c-format
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA（仅用于签�）%s\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2113
 #, c-format
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA（仅用于签�）%s\n"
 
-#: g10/keygen.c:2142
+#: g10/keygen.c:2119
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) ElGamal（仅用于加密）%s\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, c-format
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA（仅用于加密）%s\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2127
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)%s\n"
 msgstr "   (%d) DSA（自定义用途）%s\n"
 
-#: g10/keygen.c:2152
+#: g10/keygen.c:2129
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)%s\n"
 msgstr "   (%d) RSA（自定义用途）%s\n"
 
-#: g10/keygen.c:2158
+#: g10/keygen.c:2135
 #, c-format
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) ECC（签�和加密）%s\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 msgid " *default*"
 msgstr " *默认*"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC（仅用于签�）\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)%s\n"
 msgstr "  (%d) ECC（自定义用途）%s\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2140
 #, c-format
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "  (%d) ECC（仅用于加密）%s\n"
 
-#: g10/keygen.c:2167
+#: g10/keygen.c:2144
 #, c-format
 msgid "  (%d) Existing key%s\n"
 msgstr "  (%d) 现有密钥 %s\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, c-format
 msgid "  (%d) Existing key from card%s\n"
 msgstr " （%d）�中现有密钥 %s\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "输入 keygrip： "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "没有此 keygrip 关�的密钥\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "�片的�列�：%s\n"
 
-#: g10/keygen.c:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "�用的密钥：\n"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "�入到 %u �\n"
 
-#: g10/keygen.c:2570
+#: g10/keygen.c:2547
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 密钥的长度应在 %u �与 %u �之间。\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2555
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "您想�为此�密钥使用的密钥长度？(%u) "
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "请求的密钥长度是 %u �\n"
 
-#: g10/keygen.c:2641
+#: g10/keygen.c:2618
 msgid "Please select which elliptic curve you want:\n"
 msgstr "请选择您想�使用的椭圆曲线：\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5266,7 +5253,7 @@ msgstr ""
 "      <n>m = 密钥在 n 月�过期\n"
 "      <n>y = 密钥在 n 年�过期\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5282,38 +5269,38 @@ msgstr ""
 "      <n>m = 签�在 n 月�过期\n"
 "      <n>y = 签�在 n 年�过期\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期�是？(0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "签�的有效期�是？(%s) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "无效的值\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr "密钥永远�会过期\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr "签�永远�会过期\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "密钥于 %s 过期\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "签�于 %s 过期\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5321,11 +5308,11 @@ msgstr ""
 "您的系统无法显示 2038 年以�的日期。\n"
 "�过它�以正确地处�到 2106 年之�的日期。\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr "这些内容正确�？ (y/N) "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5339,7 +5326,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5354,41 +5341,41 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>�\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "真实姓�： "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "姓��有无效的字符\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "字符‘%s’和‘%s’�能出现在姓�中\n"
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "电�邮件地�： "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "电�邮件地�无效\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "注释： "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "注释�有无效的字符\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5399,11 +5386,11 @@ msgstr ""
 "    “%s�\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请��把电�邮件地�放进您的真实姓�或注释里\n"
 
-#: g10/keygen.c:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr "这样的用户标识已�存在于这个密钥上了�\n"
 
@@ -5418,31 +5405,31 @@ msgstr "这样的用户标识已�存在于这个密钥上了�\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "更改姓�（N）�注释（C）�电�邮件地�（E）或退出（Q）？ "
 
-#: g10/keygen.c:3142
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "更改姓�（N）�注释（C）�电�邮件地�（E）或确定（O）/退出（Q）？ "
 
-#: g10/keygen.c:3147
+#: g10/keygen.c:3124
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "更改姓�（N）�注释（C）�电�邮件地�（E）或退出（Q）？ "
 
-#: g10/keygen.c:3148
+#: g10/keygen.c:3125
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "更改姓�（N）�注释（C）�电�邮件地�（E）或确定（O）/退出（Q）？ "
 
-#: g10/keygen.c:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5453,18 +5440,18 @@ msgstr ""
 "�移动鼠标�读写硬盘之类的）将会是一个�错的主�；这会让�机数\n"
 "�生器有更好的机会获得足够的熵。\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr "警告：已指定 v4，但被 v5 覆盖。\n"
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "密钥生�失败：%s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5475,64 +5462,64 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr "继续�？ (Y/n) "
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "一个 \"%s\" 的密钥已�存在\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 msgid "Create anyway? (y/N) "
 msgstr "无论如何都�创建�？(y/N) "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, c-format
 msgid "creating anyway\n"
 msgstr "无论如何都创建\n"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "注�：使用 “%s %s� 以获得一个全功能的密钥生�对�框。\n"
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "密钥生�已�消。\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "�能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "注�：�片密钥的备份已�存到‘%s’\n"
 
-#: g10/keygen.c:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "正在将公钥写至‘%s’\n"
 
-#: g10/keygen.c:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "无�写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时�生错误： %s\n"
 
-#: g10/keygen.c:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和�钥已�生�并被签�。\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 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"
@@ -5540,34 +5527,34 @@ msgstr ""
 "请注�这个密钥�能用于加密。您�能想�使用“--edit-key�命令�\n"
 "生�一个用于此用途的�密钥。\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥已�在 %lu 秒�的未�生�（�能是因为时空扭曲或时钟的问题）\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥已�在 %lu 秒�的未�生�（�能是因为时空扭曲或时钟的问题）\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注�：为 v3 密钥创建�密钥是�与 OpenPGP 兼容的\n"
 
-#: g10/keygen.c:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主密钥的�钥部分��用。\n"
 
-#: g10/keygen.c:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主密钥的�钥部分存储在�上。\n"
 
-#: g10/keygen.c:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr "真的�创建�？(y/N) "
 
@@ -5575,71 +5562,87 @@ msgstr "真的�创建�？(y/N) "
 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"
 msgstr[0] "%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"
 msgstr[0] "%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"
 msgstr[0] "警告：%lu 把密钥因尺寸大而被跳过\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "钥匙环"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "主密钥指纹："
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr " 主密钥指纹："
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "      �密钥指纹："
 
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr "      密钥指纹 ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr "      �片�列� ="
 
@@ -5888,7 +5891,7 @@ msgstr "解密失败：%s\n"
 #: sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
-msgstr ""
+msgstr "未能满足�规规则，�作已强制�消\n"
 
 #: g10/mainproc.c:944
 #, c-format
@@ -6002,7 +6005,7 @@ msgstr "二进制"
 msgid "textmode"
 msgstr "文本模�"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "未知"
 
@@ -6136,27 +6139,27 @@ msgstr "�压缩"
 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:1614
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "有歧义的选项‘%s’\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "未知的弱摘�‘%s’\n"
@@ -6270,7 +6273,7 @@ msgstr ""
 "创建于 %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6283,75 +6286,75 @@ msgstr ""
 "请记�这张图片储存在您的公钥里。如果您挑了过大的图片的�，\n"
 "您的密钥也会�得�常大�请把图片控制到接近�想尺寸 240x288。\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "输入�当作照片标识的 JPEG 文件�： "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "无法打开 JPEG 文件‘%s’：%s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:239
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "此 JPEG 文件过大（%d 字节）�\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:241
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "您确定�用它�？(y/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:257
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "‘%s’�是一个 JPEG 文件\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "这张照片正确�？(y/N/q) "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "�支�远程程�执行\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:593
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "此平�上调用外部程�时�求临时文件\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "外部程�异常退出\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "调用外部程�时出现系统错误：%s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:707
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "警告：无法删除临时文件（%s）‘%s’：%s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:711
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "警告：无法删除临时目录‘%s’：%s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr "由于文件����安全，外部程�调用被�用\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "无法显示照片标识�\n"
@@ -6658,12 +6661,12 @@ msgstr "未知的默认接收者 “%s�\n"
 msgid "no valid addressees\n"
 msgstr "没有有效的地�\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "注�：密钥 %s 没有 %s 特性\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "注�：密钥 %s 没有关于 %s 的�好设置\n"
@@ -7653,7 +7656,7 @@ msgstr "使用 %s 信任模型\n"
 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"
@@ -7683,36 +7686,36 @@ msgstr "请执行一次 --check-trustdb\n"
 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"
 msgstr[0] "已处� %d 把密钥"
 
-#: g10/trustdb.c:2088
+#: g10/trustdb.c:2100
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " （%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"
@@ -7835,7 +7838,7 @@ msgstr ""
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -7843,7 +7846,7 @@ msgstr "%s数字: %s%%0A�有者: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -7873,7 +7876,7 @@ msgstr "|N|请输入新的解�密钥"
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "||请为您的 PIV �片输入解�密钥"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -7957,68 +7960,68 @@ msgstr[0] "密钥生�完�（%d 秒）\n"
 msgid "response does not contain the public key data\n"
 msgstr "�应�包�公钥数�\n"
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|请输入管�员 PIN"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||请输入标准密钥的 PIN。"
 
-#: scd/app-nks.c:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 余数缺失或者�是 %d �长\n"
 
-#: scd/app-nks.c:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公钥指数缺失或长于 %d �\n"
 
-#: scd/app-nks.c:1654
+#: scd/app-nks.c:1656
 msgid "Note: PIN has not yet been enabled."
 msgstr "注�：尚未�用 PIN。"
 
-#: scd/app-nks.c:1701
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "尚未�更 NullPIN\n"
 
-#: scd/app-nks.c:2074
+#: scd/app-nks.c:2088
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|请为标准密钥输入一个新的 PIN。"
 
-#: scd/app-nks.c:2082
+#: 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:2092
+#: 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:2102
+#: 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:2104
+#: 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:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "获�新 PIN 时出现错误：%s\n"
@@ -8271,26 +8274,26 @@ msgstr "fd %d 的�柄已�动\n"
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d 的�柄已关闭\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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
 #, c-format
 msgid "validation model requested by certificate: %s"
 msgstr "�书所请求的验�模型：%s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:199 sm/certchain.c:2211
 msgid "chain"
 msgstr "链"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 msgid "shell"
 msgstr "外壳"
 
@@ -8313,234 +8316,234 @@ msgstr "未�置关键标记策略"
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "获�指纹失败\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "在外部�置查找签�者\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "匹�的签�者数目：%d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "无法获� authorityInfoAccess：%s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:793
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "在 Dirmngr 缓存中查找签�者\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:818
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "匹�的�书数：%d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "分� keyDB �柄时失败\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1260 sm/certchain.c:1264
 msgid "certificate has been revoked"
 msgstr "�书已被�销"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr "�书的状�未知"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "请确定“dirmngr�被正确安装\n"
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr "�书尚未验�"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 msgid "root certificate not yet valid"
 msgstr "根�书尚未验�"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr "中间�书尚未验�"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr "�书已过期"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 msgid "root certificate has expired"
 msgstr "根�书已过期"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 msgid "intermediate certificate has expired"
 msgstr "中间�书已过期"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "请求的�书属性缺失：%s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1404
 msgid "certificate with invalid validity"
 msgstr "�书有效期无效"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr "签��是在�书的有效期内被创建的"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr "签��是在签�者的有效期内被创建的"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "中间�书�是在签�者的有效期内被创建的"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, c-format
 msgid "  (  signature created at "
 msgstr "  （  签�创建于 "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, c-format
 msgid "  (certificate created at "
 msgstr "  （�书创建于 "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  （�书有效期从 "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  （    签�者有效期从 "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "指纹 = %s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "根�书现已被标记为信任\n"
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1505
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "交互�标记为信任未在 gpg-agent 中开�\n"
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1511
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "交互�标记为信任在此会�中被关闭\n"
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "警告：签�的创建时间未知 - 猜测为当�时间"
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 msgid "no issuer found in certificate"
 msgstr "�书中没有找到签�者"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 msgid "self-signed certificate has a BAD signature"
 msgstr "自签��书具有��的签�"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "根�书未被标记为信任"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "检查信任列表时失败：%s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "�书链过长\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr "签�者�书未找到"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "�书具有��的签�"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1911 dirmngr/validate.c:693
 msgid "found another possible matching CA certificate - trying again"
 msgstr "找到�一个�能匹�的 CA �书 - 正在�试"
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr "�书有效\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "中间�书有效\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, c-format
 msgid "root certificate is good\n"
 msgstr "根�书良好\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr "正在切�为链模型"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr "使用的验�模型：%s"
@@ -8563,7 +8566,7 @@ msgstr "内存�足\n"
 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:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "none"
 
@@ -8597,42 +8600,42 @@ msgstr ""
 "S/N %s，ID 0x%08lX，\n"
 "创建于 %s，过期于 %s。\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "没有指定密钥用途 - �设为所有用途\n"
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "�书本�应被用于认�\n"
 
-#: sm/certlist.c:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "�书本�应被用于认 OCSP �应签�\n"
 
-#: sm/certlist.c:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "�书本�应被用于加密\n"
 
-#: sm/certlist.c:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "�书本�应被用于签�\n"
 
-#: sm/certlist.c:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "�书��用于加密\n"
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "�书��用于签�\n"
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "查找�一个�书\n"
@@ -9177,7 +9180,7 @@ msgstr "为签�者 %d 使用的散列算法：%s (%s)\n"
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "检查�格�书失败：%s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, c-format
 msgid "%s/%s signature using %s key %s\n"
 msgstr "%s/%s 使用 %s 密钥 %s 创建的签�\n"
@@ -9366,7 +9369,7 @@ msgstr "正在移除缓存文件‘%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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "关闭缓存文件时出现错误：%s\n"
@@ -9619,197 +9622,197 @@ msgstr "未知的散列算法‘%s’\n"
 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:1849 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "创建 S 表达�时失败：%s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1923
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1938
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "从 CRL 获�更新次数时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1945
 #, 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:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "nextUpdate �数未被指定；�设有效期为一天\n"
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "获� CRL 项目时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1984
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "�临时缓存文件中�入项目时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2011
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "没有在 CRL 中找到 CRL 签�者： %s\n"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "正在通过 authorityKeyIdentifier 定� CRL 签�者\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL 签�验�失败：%s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2084
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "检查 CRL 签署者�书的有效性时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2226
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2233
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2267
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "移除过期的缓存文件‘%s’\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2271
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "移除过期的缓存文件‘%s’时出现问题：%s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "创建临时缓存文件‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2291
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "完�临时缓存文件时出现错误‘%s’：%s\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2308
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "关闭临时缓存文件时出现错误‘%s’：%s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2333
 #, 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:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "新的 CRL �然太旧；其已在 %s 过期\n"
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "未知的紧急 CRL 扩展 %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "读� CRL 扩展时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2414
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "正在创建缓存文件‘%s’\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "将‘%s’�命�为‘%s’时出现问题：%s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2460
 #, 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:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "开始 CRL 导出（已通过 %s �回）\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 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:2523
 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:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr " 错误：此 CRL 将�会被使用\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " 错误：此缓存的 CRL �能已�被篡改�\n"
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " 警告： 无效的缓存记录长度\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2558
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "读�缓存记录时出现问题：%s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2569
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "读�缓存的密钥时出现问题：%s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2600
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "从数�库读�缓存项目时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2603
 msgid "End CRL dump\n"
 msgstr "结� CRL 导出\n"
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "通过 DP 的 crl_fetch 方法失败：%s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "通过 DP 进行 crl_cache_insert 失败：%s\n"
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "通过�布者进行 crl_cache_insert 失败：%s\n"
@@ -9820,10 +9823,8 @@ msgid "reader to file mapping table full - waiting\n"
 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
@@ -10043,10 +10044,8 @@ msgid "use system's HTTP proxy setting"
 msgstr "使用系统的 HTTP 代�设置"
 
 #: dirmngr/dirmngr.c:252
-#, fuzzy
-#| msgid "Configuration for HTTP servers"
 msgid "Configuration for OpenPGP servers"
-msgstr "对 HTTP �务器的�置"
+msgstr "对 OpenPGP �务器的�置"
 
 #: dirmngr/dirmngr.c:255
 msgid "|URL|use keyserver at URL"
@@ -10057,10 +10056,8 @@ msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|为承载 HKP 的 TLS 使用 FILE 中的 CA �书"
 
 #: dirmngr/dirmngr.c:259
-#, fuzzy
-#| msgid "Configuration for HTTP servers"
 msgid "Configuration for X.509 servers"
-msgstr "对 HTTP �务器的�置"
+msgstr "对 X.509 �务器的�置"
 
 #: dirmngr/dirmngr.c:261
 msgid "inhibit the use of LDAP"
@@ -10155,12 +10152,12 @@ msgstr "用法：%s [选项] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "套接字�称中��许使用冒�\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "从‘%s’处获� CRL 时失败：%s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "从‘%s’处处� CRL 时失败：%s\n"
@@ -10351,10 +10348,8 @@ msgid "response from server too large; limit is %d bytes\n"
 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
@@ -10406,91 +10401,91 @@ msgstr "计算‘%s’的  OCSP 请求的散列时失败：%s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "并�由一个默认的 OCSP 签�者的�书签�"
 
-#: dirmngr/ocsp.c:582
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "分�列表项时失败：%s\n"
 
-#: dirmngr/ocsp.c:598 dirmngr/ocsp.c:782
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "获��应者 ID 时出现错误：%s\n"
 
-#: dirmngr/ocsp.c:642
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "未找到�适的�书�验� OCSP 请求\n"
 
-#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "未找到签�者�书：%s\n"
 
-#: dirmngr/ocsp.c:691
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "调用者没有返回目标�书\n"
 
-#: dirmngr/ocsp.c:698
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "调用者没有返回签�的�书\n"
 
-#: dirmngr/ocsp.c:708
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "分� OCSP 上下文时失败：%s\n"
 
-#: dirmngr/ocsp.c:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "未定义默认的 OCSP �应者\n"
 
-#: dirmngr/ocsp.c:753
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "未定义默认的 OCSP 签�者\n"
 
-#: dirmngr/ocsp.c:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "正在使用默认的 OCSP �应者‘%s’\n"
 
-#: dirmngr/ocsp.c:765
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "正在使用 OCSP �应者‘%s’\n"
 
-#: dirmngr/ocsp.c:822
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "获�目标�书的 OCSP 状�时出现错误：%s\n"
 
-#: dirmngr/ocsp.c:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "�书状�：%s  (当�=%s  下一个=%s)\n"
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "良好"
 
-#: dirmngr/ocsp.c:854
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "�书已�被�销于： %s 原因是： %s\n"
 
-#: dirmngr/ocsp.c:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP �应者返回了将�的状�\n"
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP �应者返回了一个�当�的状�\n"
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP 返回了一个太以�的状�\n"
@@ -10504,63 +10499,63 @@ msgstr "assuan_inquire(%s) 方法失败：%s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire 方法失败：%s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "��数�时出现错误：%s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch 方法失败：%s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1776
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert 方法失败：%s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "超过设置的 max_replies %d\n"
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "无法分�控制结构：%s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "分� assuan 上下文时失败：%s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "�始化�务器时失败：%s\n"
 
-#: dirmngr/server.c:3062
+#: dirmngr/server.c:3078
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "� Assuan 注册命令时失败：%s\n"
 
-#: dirmngr/server.c:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan 接�出现问题：%s\n"
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan 处�时失败：%s\n"
@@ -10865,33 +10860,33 @@ msgstr ""
 "语法：gpg-check-pattern [选项] patternfile\n"
 "按照 patternfile 检查一个由标准输入（stdin）给定的密�\n"
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: tools/gpg-card.c:2428
 #, c-format
 msgid "Note: Keys are already stored on the card!\n"
 msgstr "注�： 已有�钥被存储于�片上�\n"
 
-#: tools/gpg-card.c:2427
+#: tools/gpg-card.c:2431
 #, c-format
 msgid "Replace existing key %s ? (y/N) "
 msgstr "替�现有密钥 %s ？(y/N) "
 
-#: tools/gpg-card.c:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: 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:3437 tools/gpg-card.c:3451
+#: tools/gpg-card.c:3441 tools/gpg-card.c:3455
 #, c-format
 msgid ""
 "Warning: Setting the User Interaction Flag to \"%s\"\n"
@@ -10900,47 +10895,56 @@ msgstr ""
 "警告：正在将用户交互标志设置为“%s�\n"
 "      �能使用出厂�置还原�\n"
 
-#: tools/gpg-card.c:3454
+#: 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:3700
+#: tools/gpg-card.c:3758
 msgid "authenticate to the card"
 msgstr "验��片"
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr "��片守护进程���置"
 
-#: tools/gpg-card.c:3704
+#: tools/gpg-card.c:3762
 msgid "setup KDF for PIN authentication"
 msgstr "针对 PIN 身份验�设置 KDF"
 
-#: tools/gpg-card.c:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr "更改�有数�对象"
 
-#: tools/gpg-card.c:3707
+#: tools/gpg-card.c:3765
 msgid "read a certificate from a data object"
 msgstr "从数�对象中读��书"
 
-#: tools/gpg-card.c:3708
+#: tools/gpg-card.c:3766
 msgid "store a certificate to a data object"
 msgstr "储存一个�书到数�对象"
 
-#: tools/gpg-card.c:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr "储存�钥到数�对象"
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr "Yubikey 管�命令"
 
-#: tools/gpg-card.c:3712
+#: tools/gpg-card.c:3772
 msgid "manage the command history"
 msgstr "管�命令历�记录"
 
+#~ 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"
 
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index d987cc8..6648213 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0f160e2..a6fe32b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.1.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-10-13 16:02+0200\n"
+"POT-Creation-Date: 2022-12-16 17:50+0100\n"
 "PO-Revision-Date: 2019-11-04 09:49+0100\n"
 "Last-Translator: Jedi Lin <Jedi@Jedi.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -158,8 +158,8 @@ msgstr ""
 msgid "Passphrase:"
 msgstr "密語:"
 
-#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2108
-#: agent/command.c:2167 agent/command-ssh.c:3145 agent/genkey.c:427
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2117
+#: agent/command.c:2176 agent/command-ssh.c:3150 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "�後�一致 - 請�試一次"
 
@@ -208,17 +208,17 @@ msgstr ""
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1329 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1338 g10/card-util.c:741 g10/card-util.c:762
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "�得此�片�號時出錯: %s\n"
 
-#: agent/command.c:1935 agent/command.c:2100 agent/command-ssh.c:3073
+#: agent/command.c:1944 agent/command.c:2109 agent/command-ssh.c:3078
 #: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "請�次輸入密語"
 
-#: agent/command.c:2889
+#: agent/command.c:2898
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -228,7 +228,7 @@ msgid ""
 "system."
 msgstr "請輸入密語以�護匯入至 GnuPG 系統內的物件."
 
-#: agent/command.c:3019
+#: agent/command.c:3039
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -239,25 +239,25 @@ msgstr ""
 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:1455 g10/keygen.c:5391 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:739 tools/gpg-card.c:493
+#: agent/command-ssh.c:874 common/dotlock.c:851 g10/card-util.c:990
+#: g10/export.c:1554 g10/gpg.c:1445 g10/keygen.c:5362 g10/keyring.c:1329
+#: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:638 g10/photoid.c:656
+#: g10/sign.c:1113 g10/sign.c:1452 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:886 common/helpfile.c:57 g10/card-util.c:947
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:148 g10/encrypt.c:450 g10/encrypt.c:856 g10/gpg.c:1456
-#: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4337
+#: g10/decrypt.c:148 g10/encrypt.c:442 g10/encrypt.c:847 g10/gpg.c:1446
+#: g10/import.c:380 g10/import.c:567 g10/import.c:802 g10/keygen.c:4311
 #: 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:744
-#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2277
-#: sm/gpgsm.c:2307 sm/gpgsm.c:2345 sm/keylist.c:1809 sm/qualified.c:65
+#: g10/tdbio.c:799 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2281
+#: sm/gpgsm.c:2311 sm/gpgsm.c:2349 sm/keylist.c:1827 sm/qualified.c:65
 #: dirmngr/certcache.c:420 dirmngr/certcache.c:502 dirmngr/certcache.c:504
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1828 tools/gpg-card.c:422
+#: dirmngr/crlcache.c:2640 dirmngr/dirmngr.c:1828 tools/gpg-card.c:423
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "無法開啟 '%s': %s\n"
@@ -267,13 +267,13 @@ msgstr "無法開啟 '%s': %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "找�到��的�片金鑰: %s\n"
 
-#: agent/command-ssh.c:2467
+#: agent/command-ssh.c:2472
 #, 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:2777
+#: agent/command-ssh.c:2782
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -281,20 +281,20 @@ msgid ""
 msgstr ""
 "有�個 ssh 程��出使用金鑰 %%0A  %s%%0A  (%s)%%0A 之請求, 請�是��許?"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Allow"
 msgstr "�許"
 
-#: agent/command-ssh.c:2784 agent/findkey.c:1240
+#: agent/command-ssh.c:2789 agent/findkey.c:1240
 msgid "Deny"
 msgstr "拒絕"
 
-#: agent/command-ssh.c:2793
+#: agent/command-ssh.c:2798
 #, 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:3100
+#: agent/command-ssh.c:3105
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -302,7 +302,7 @@ msgid ""
 msgstr ""
 "請輸入密語以�護收到的�鑰 %%0A   %s%%0A   %s%%0A 於 gpg-agent 的金鑰存放處"
 
-#: agent/command-ssh.c:3797
+#: agent/command-ssh.c:3837
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "從 socket 建立串�失敗: %s\n"
@@ -425,219 +425,225 @@ msgstr "請輸入密語至%0A以�護你的新金鑰"
 msgid "Please enter the new passphrase"
 msgstr "請輸入新的密語"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:168 scd/scdaemon.c:115 dirmngr/dirmngr.c:186
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "�除錯有幫助的�項"
 
-#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
+#: agent/gpg-agent.c:170 scd/scdaemon.c:120 dirmngr/dirmngr.c:175
 msgid "run in daemon mode (background)"
 msgstr "以�務模�執行 (背景)"
 
-#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:171 scd/scdaemon.c:117 dirmngr/dirmngr.c:174
 msgid "run in server mode (foreground)"
 msgstr "以伺�器模�執行 (�景)"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:121 dirmngr/dirmngr.c:188
 msgid "do not detach from the console"
 msgstr "��從 console 分離"
 
-#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:122 dirmngr/dirmngr.c:189
 msgid "sh-style command output"
 msgstr "sh 樣�的指令輸出"
 
-#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
+#: agent/gpg-agent.c:177 scd/scdaemon.c:123 dirmngr/dirmngr.c:190
 msgid "csh-style command output"
 msgstr "csh 樣�的指令輸出"
 
-#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
+#: agent/gpg-agent.c:186 g10/gpg.c:597 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:193
 msgid "|FILE|read options from FILE"
 msgstr "|檔案|從指定檔案中讀��項"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
+#: agent/gpg-agent.c:190 g10/gpg.c:582 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:197
 msgid "Options controlling the diagnostic output"
 msgstr "控制著診斷性輸出的�項"
 
-#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:192 g10/gpg.c:584 g10/gpgv.c:78 kbx/kbxutil.c:88
 #: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
 #: dirmngr/dirmngr.c:199 tools/gpg-connect-agent.c:88 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "囉唆模�"
 
-#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:89
+#: agent/gpg-agent.c:193 g10/gpg.c:586 g10/gpgv.c:79 kbx/kbxutil.c:89
 #: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:200
 msgid "be somewhat more quiet"
 msgstr "盡�安�些"
 
-#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
+#: agent/gpg-agent.c:201 g10/gpg.c:601 sm/gpgsm.c:288 dirmngr/dirmngr.c:210
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|檔案|將伺�器模�日誌寫入至指定檔案"
 
-#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
+#: agent/gpg-agent.c:205 g10/gpg.c:607 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:214
 msgid "Options controlling the configuration"
 msgstr "控制著組態的�項"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:208
 msgid "do not use the SCdaemon"
 msgstr "��使用 SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:210
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|使用 PGM �為 SCdaemon 程�"
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 #, 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:215
+#: agent/gpg-agent.c:216
 #, fuzzy
 #| msgid "|NAME|connect to host NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|�稱|連線至�於指定�稱的主機"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:220
 msgid "ignore requests to change the TTY"
 msgstr "忽略變更 TTY 的�求"
 
-#: agent/gpg-agent.c:221
+#: agent/gpg-agent.c:222
 msgid "ignore requests to change the X display"
 msgstr "忽略變更 X display 的�求"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:223
 msgid "enable ssh support"
 msgstr "啟用 ssh 支�"
 
-#: agent/gpg-agent.c:224
+#: agent/gpg-agent.c:225
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:227
+#: agent/gpg-agent.c:228
 msgid "enable putty support"
 msgstr "啟用 putty 支�"
 
-#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
+#: agent/gpg-agent.c:235
+#, fuzzy
+#| msgid "enable putty support"
+msgid "enable Win32-OpenSSH support"
+msgstr "啟用 putty 支�"
+
+#: agent/gpg-agent.c:247 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "控制著安全性的�項"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:250
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|讓快��的個人識別碼 (PIN) 在 N 秒後到期"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:252
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|在 N 秒之後讓 SSH 金鑰�期"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:254
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|把個人識別碼 (PIN) 快�最大生存時間設� N 秒"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:256
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|把 SSH 金鑰最大生存時間設� N 秒"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:258
 msgid "do not use the PIN cache when signing"
 msgstr "簽署時��使用個人識別碼 (PIN) 快�"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:260
 #, fuzzy
 #| msgid "do not allow the reuse of old passphrases"
 msgid "disallow the use of an external password cache"
 msgstr "��許�複使用舊密語"
 
-#: agent/gpg-agent.c:254
+#: agent/gpg-agent.c:262
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "��許用戶端將金鑰標記為 \"已信任\""
 
-#: agent/gpg-agent.c:259
+#: agent/gpg-agent.c:267
 msgid "allow presetting passphrase"
 msgstr "�許�先設定密語"
 
-#: agent/gpg-agent.c:264
+#: agent/gpg-agent.c:272
 msgid "Options enforcing a passphrase policy"
 msgstr "強制執行密語原則的�項"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:275
 msgid "do not allow bypassing the passphrase policy"
 msgstr "��許略�密語原則"
 
-#: agent/gpg-agent.c:269
+#: agent/gpg-agent.c:277
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|把新密語所需的最短長度設� N"
 
-#: agent/gpg-agent.c:271
+#: agent/gpg-agent.c:279
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|新密語至少�有 N 個�字�的字符"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:282
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|檔案|用指定檔案中的樣�來檢查新密語"
 
-#: agent/gpg-agent.c:278
+#: agent/gpg-agent.c:286
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|在 N 天之後讓密語�期"
 
-#: agent/gpg-agent.c:280
+#: agent/gpg-agent.c:288
 msgid "do not allow the reuse of old passphrases"
 msgstr "��許�複使用舊密語"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:291
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "控制著安全性的�項"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:293
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:287
+#: agent/gpg-agent.c:295
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:289
+#: agent/gpg-agent.c:297
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "��奪��盤�滑鼠"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:300
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|使用 PGM �為 PIN-Entry 程�"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:304
 #, 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:300
+#: agent/gpg-agent.c:308
 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:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
+#: agent/gpg-agent.c:573 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1147 g10/gpgv.c:149 kbx/kbxutil.c:117 scd/scdaemon.c:313
 #: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:457
 #: 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:570
+#: agent/gpg-agent.c:582
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "用法: @GPG_AGENT@ [�項] (或用 -h 求助)"
 
-#: agent/gpg-agent.c:572
+#: agent/gpg-agent.c:584
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -645,136 +651,136 @@ msgstr ""
 "語法: @GPG_AGENT@ [�項] [指令 [引數]]\n"
 "@GNUPG@ �鑰管�\n"
 
-#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
+#: agent/gpg-agent.c:629 g10/gpg.c:1345 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:541
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "給定的除錯等級 '%s' 無效\n"
 
-#: agent/gpg-agent.c:993 g10/gpg.c:3958 g10/gpg.c:3982 sm/gpgsm.c:1663
+#: agent/gpg-agent.c:1005 g10/gpg.c:3921 g10/gpg.c:3945 sm/gpgsm.c:1663
 #: sm/gpgsm.c:1669
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "所�的摘�演算法無效\n"
 
-#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2062 common/comopt.c:95
-#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
+#: agent/gpg-agent.c:1234 agent/gpg-agent.c:2083 common/comopt.c:95
+#: g10/gpg.c:2588 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1079
 #: dirmngr/dirmngr.c:1954
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "從 '%s' 讀��項中\n"
 
-#: agent/gpg-agent.c:1338 g10/gpg.c:3899 scd/scdaemon.c:688 sm/gpgsm.c:1600
+#: agent/gpg-agent.c:1359 g10/gpg.c:3867 scd/scdaemon.c:688 sm/gpgsm.c:1600
 #: dirmngr/dirmngr.c:1196 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:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1288
+#: agent/gpg-agent.c:1410 g10/misc.c:1188 dirmngr/dirmngr.c:1288
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告: 已�建議使用 \"%s\" �項\n"
 
-#: agent/gpg-agent.c:2215 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
+#: agent/gpg-agent.c:2236 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1361
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 socket: %s\n"
 
-#: agent/gpg-agent.c:2232 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
+#: agent/gpg-agent.c:2253 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1374
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket �稱 '%s' 太長\n"
 
-#: agent/gpg-agent.c:2270
+#: agent/gpg-agent.c:2291
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2276
+#: agent/gpg-agent.c:2297
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "已經有一份 gpg-agent 在執行了 - �會�啟動一份新的\n"
 
-#: agent/gpg-agent.c:2288 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
+#: agent/gpg-agent.c:2309 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1410
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "為 socket �得 nonce 時出錯\n"
 
-#: agent/gpg-agent.c:2293 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
+#: agent/gpg-agent.c:2314 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1413
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "�定 socket 至 '%s' 時出錯: %s\n"
 
-#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2344 agent/gpg-agent.c:2353
+#: agent/gpg-agent.c:2325 agent/gpg-agent.c:2365 agent/gpg-agent.c:2374
 #: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1422
 #, 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:2318 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
+#: agent/gpg-agent.c:2339 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1434
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "正在候� socket '%s'\n"
 
-#: agent/gpg-agent.c:2338 agent/gpg-agent.c:2391 common/homedir.c:790
-#: g10/openfile.c:399 g10/photoid.c:379
+#: agent/gpg-agent.c:2359 agent/gpg-agent.c:2412 common/homedir.c:790
+#: g10/openfile.c:399 g10/photoid.c:486
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "無法建立目錄 '%s': %s\n"
 
-#: agent/gpg-agent.c:2341 agent/gpg-agent.c:2396 common/homedir.c:793
+#: agent/gpg-agent.c:2362 agent/gpg-agent.c:2417 common/homedir.c:793
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "目錄 '%s' 已建立\n"
 
-#: agent/gpg-agent.c:2402
+#: agent/gpg-agent.c:2423
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "'%s' 的 stat() 失敗: %s\n"
 
-#: agent/gpg-agent.c:2406
+#: agent/gpg-agent.c:2427
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "無法使用 '%s' �為家目錄\n"
 
-#: agent/gpg-agent.c:2561 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
+#: agent/gpg-agent.c:2582 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2183
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "於 fd %d 讀� nonce 時出錯: %s\n"
 
-#: agent/gpg-agent.c:2768
+#: agent/gpg-agent.c:2882
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "經手程� 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:2773
+#: agent/gpg-agent.c:2887
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "經手程� 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:2848
+#: agent/gpg-agent.c:2962
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh 經手程� 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:2853
+#: agent/gpg-agent.c:2967
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh 經手程� 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:3069 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
+#: agent/gpg-agent.c:3190 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2397
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_select 失敗: %s - 等 1 秒�\n"
 
-#: agent/gpg-agent.c:3157 scd/scdaemon.c:1445
+#: agent/gpg-agent.c:3278 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已�止\n"
 
-#: agent/gpg-agent.c:3298 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3419 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"
@@ -1038,7 +1044,7 @@ msgstr "檢查已建立的簽章時出錯: %s\n"
 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:1602
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "公鑰演算法 %d (%s) 未支�\n"
@@ -1053,53 +1059,53 @@ msgstr "�護演算法 %d (%s) 未支�\n"
 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:1452
+#: common/exechelp-posix.c:512 common/exechelp-posix.c:587
+#: common/exechelp-posix.c:873 dirmngr/dirmngr.c:1452
 #, 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"
@@ -1129,19 +1135,19 @@ msgstr "警告: %s 的所有權 \"%s\" 並�安全\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告: %s 的權� \"%s\" 並�安全\n"
 
-#: common/sysutils.c:884
+#: common/sysutils.c:881
 #, fuzzy, c-format
 #| msgid "waiting for the agent to come up ... (%ds)\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "正在等候代�程�出� ... (%d 秒)\n"
 
-#: common/sysutils.c:910
+#: common/sysutils.c:907
 #, 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:3113
+#: common/yesno.c:45 common/yesno.c:82 tools/gpg-card.c:3117
 msgid "yes"
 msgstr "yes"
 
@@ -1195,8 +1201,8 @@ msgstr "在安全記憶體�置 %lu �元組時超出核心"
 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:430
+#: common/miscellaneous.c:115 g10/card-util.c:954 tools/no-libgcrypt.c:30
+#: tools/gpg-card.c:431
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "�置足夠的記憶體時出錯: %s\n"
@@ -1216,75 +1222,75 @@ msgstr "警告: \"%s%s\" 是已廢棄的�項 - 沒有效果\n"
 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:432 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"
@@ -1433,11 +1439,11 @@ msgstr "憑證�有效"
 msgid "Root certificate trustworthy"
 msgstr "根憑證�信賴"
 
-#: common/audit.c:1112 sm/certchain.c:1243
+#: common/audit.c:1112 sm/certchain.c:1274
 msgid "no CRL found for certificate"
 msgstr "找�到用於憑證的 CRL"
 
-#: common/audit.c:1115 sm/certchain.c:1253
+#: common/audit.c:1115 sm/certchain.c:1284
 msgid "the available CRL is too old"
 msgstr "�用的 CRL 太舊了"
 
@@ -1474,7 +1480,7 @@ msgstr "'%s' 沒有�用的說明."
 msgid "ignoring garbage line"
 msgstr "忽略垃圾列"
 
-#: common/gettime.c:923
+#: common/gettime.c:918
 msgid "[none]"
 msgstr "[ ç„¡ ]"
 
@@ -1518,36 +1524,36 @@ msgstr "iconv_open 失敗: %s\n"
 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
 #, 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"
@@ -1557,132 +1563,132 @@ msgstr "正在等候 `%s' 鎖定...\n"
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太舊了 (需� %s, 但是祇有 %s)\n"
 
-#: g10/armor.c:441
+#: 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:1462
+#: g10/build-packet.c:1480
 #, fuzzy, c-format
 #| msgid "not human readable"
 msgid "[ not human readable (%zu bytes: %s%s) ]"
 msgstr "�是人類能讀得懂的"
 
-#: g10/build-packet.c:1514
+#: g10/build-packet.c:1532
 #, c-format
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "標記�稱一定�採用��出的字符或空白, 並以一個 '=' 來�尾\n"
 
-#: g10/build-packet.c:1526 g10/build-packet.c:1622
+#: g10/build-packet.c:1544 g10/build-packet.c:1640
 #, c-format
 msgid "a user notation name must contain the '@' character\n"
 msgstr "使用者標記�稱一定��有 '@' 字符\n"
 
-#: g10/build-packet.c:1532 g10/build-packet.c:1628
+#: g10/build-packet.c:1550 g10/build-packet.c:1646
 #, c-format
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "使用者標記�稱�得�有兩個或更多的 '@' 字符\n"
 
-#: g10/build-packet.c:1550
+#: g10/build-packet.c:1568
 #, c-format
 msgid "a notation value must not use any control characters\n"
 msgstr "標記值一定�能使用任何的控制字符\n"
 
-#: g10/build-packet.c:1606
+#: g10/build-packet.c:1624
 #, 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:1612
+#: g10/build-packet.c:1630
 #, fuzzy, c-format
 #| msgid ""
 #| "a notation name must have only printable characters or spaces, and end "
@@ -1690,7 +1696,7 @@ msgstr "使用者標記�稱�得�有兩個或更多的 '@' 字符\n"
 msgid "a notation name must have only printable characters or spaces\n"
 msgstr "標記�稱一定�採用��出的字符或空白, 並以一個 '=' 來�尾\n"
 
-#: g10/build-packet.c:1671 g10/build-packet.c:1682
+#: g10/build-packet.c:1689 g10/build-packet.c:1700
 #, c-format
 msgid "WARNING: invalid notation data found\n"
 msgstr "警告: 找到無效的標記資料\n"
@@ -1704,7 +1710,7 @@ msgstr "以 %s 代�伺�器查詢用戶端時失敗\n"
 msgid "Enter passphrase: "
 msgstr "請輸入密語: "
 
-#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:424 g10/sign.c:473
+#: g10/call-agent.c:318 g10/encrypt.c:158 g10/encrypt.c:416 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"
@@ -1723,7 +1729,7 @@ msgstr "讀� %s 時出錯: %s\n"
 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:2330
+#: 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"
@@ -1769,170 +1775,170 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "產生撤銷憑證"
 
-#: g10/call-dirmngr.c:430 g10/gpg.c:4647 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:430 g10/gpg.c:4595 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:3070
+#: g10/card-util.c:86 g10/card-util.c:394 g10/card-util.c:1964
+#: 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:1970
 #, 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:4809 g10/revoke.c:214 g10/revoke.c:639
+#: g10/card-util.c:97 g10/card-util.c:2349 g10/delkey.c:164 g10/keyedit.c:1429
+#: g10/keygen.c:4780 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:2974
+#: 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:3432 tools/gpg-card.c:2979
+#: g10/card-util.c:107 scd/app-openpgp.c:3432 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:2002 g10/keygen.c:2176 g10/keygen.c:2396 g10/keygen.c:2696
+#: g10/card-util.c:140 g10/card-util.c:1485 g10/card-util.c:1750
+#: g10/card-util.c:1842 g10/keyedit.c:395 g10/keyedit.c:416 g10/keyedit.c:430
+#: g10/keygen.c:1979 g10/keygen.c:2153 g10/keygen.c:2373 g10/keygen.c:2673
 #: sm/certreqgen-ui.c:166 sm/certreqgen-ui.c:292 sm/certreqgen-ui.c:326
-#: tools/gpg-card.c:524
+#: tools/gpg-card.c:525
 msgid "Your selection? "
 msgstr "你��哪一個? "
 
-#: g10/card-util.c:267 g10/card-util.c:318 tools/gpg-card.c:610
-#: tools/gpg-card.c:650
+#: 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:919
+#: g10/card-util.c:591 tools/gpg-card.c:923
 msgid "Mr."
 msgstr ""
 
-#: g10/card-util.c:592 tools/gpg-card.c:920
+#: g10/card-util.c:592 tools/gpg-card.c:924
 msgid "Ms."
 msgstr ""
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "not forced"
 msgstr "�強迫使用"
 
-#: g10/card-util.c:619 tools/gpg-card.c:947
+#: g10/card-util.c:619 tools/gpg-card.c:951
 msgid "forced"
 msgstr "強迫使用"
 
-#: g10/card-util.c:801 tools/gpg-card.c:1498
+#: g10/card-util.c:801 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:1500
+#: g10/card-util.c:803 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:1502
+#: g10/card-util.c:805 tools/gpg-card.c:1506
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "錯誤: 並��許使用連續兩個以上的空格.\n"
 
-#: g10/card-util.c:823 tools/gpg-card.c:1535
+#: g10/card-util.c:823 tools/gpg-card.c:1539
 msgid "Cardholder's surname: "
 msgstr "�片�有者的姓�: "
 
-#: g10/card-util.c:825 tools/gpg-card.c:1536
+#: g10/card-util.c:825 tools/gpg-card.c:1540
 msgid "Cardholder's given name: "
 msgstr "�片�有者的�字: "
 
-#: g10/card-util.c:844 tools/gpg-card.c:1553
+#: g10/card-util.c:844 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:1591
+#: g10/card-util.c:867 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
+#: g10/card-util.c:963 g10/decrypt-data.c:508 g10/import.c:415 g10/import.c:765
+#: g10/import.c:824 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
 #: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1764
-#: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:440
+#: 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:2595
-#: g10/export.c:2896 dirmngr/crlcache.c:925 tools/gpg-card.c:500
-#: tools/gpg-card.c:507
+#: g10/card-util.c:996 g10/decrypt-data.c:511 g10/export.c:2928
+#: g10/export.c:3162 dirmngr/crlcache.c:925 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:1680
+#: g10/card-util.c:1023 tools/gpg-card.c:1684
 msgid "Login data (account name): "
 msgstr "登入資料 (帳號�稱): "
 
-#: g10/card-util.c:1062 tools/gpg-card.c:1976
+#: g10/card-util.c:1061 tools/gpg-card.c:1980
 msgid "Private DO data: "
 msgstr "�人的 DO 資料: "
 
-#: g10/card-util.c:1147 tools/gpg-card.c:1729
+#: g10/card-util.c:1146 tools/gpg-card.c:1733
 msgid "Language preferences: "
 msgstr "介�語言�好設定: "
 
-#: g10/card-util.c:1155 tools/gpg-card.c:1740
+#: g10/card-util.c:1154 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:1749
+#: g10/card-util.c:1163 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:1783
+#: g10/card-util.c:1185 tools/gpg-card.c:1787
 msgid "Salutation (M = Mr., F = Ms., or space): "
 msgstr ""
 
-#: g10/card-util.c:1200 tools/gpg-card.c:1800
+#: g10/card-util.c:1199 tools/gpg-card.c:1804
 msgid "Error: invalid response.\n"
 msgstr "錯誤: 無效的回應.\n"
 
-#: g10/card-util.c:1223 tools/gpg-card.c:1866
+#: g10/card-util.c:1222 tools/gpg-card.c:1870
 msgid "CA fingerprint: "
 msgstr "憑證中心 (CA) 指紋: "
 
-#: g10/card-util.c:1247 tools/gpg-card.c:1892
+#: g10/card-util.c:1246 tools/gpg-card.c:1896
 #, c-format
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "錯誤: 無效的格�化指紋.\n"
 
-#: g10/card-util.c:1297
+#: g10/card-util.c:1296
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "��能進行金鑰�作: %s\n"
 
-#: g10/card-util.c:1298
+#: g10/card-util.c:1297
 msgid "not an OpenPGP card"
 msgstr "這�是 OpenPGP �片"
 
-#: g10/card-util.c:1311 g10/keygen.c:4829 g10/keygen.c:6022
+#: g10/card-util.c:1310 g10/keygen.c:4800 g10/keygen.c:5993
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�得�用金鑰資訊時出錯: %s\n"
 
-#: g10/card-util.c:1396
+#: g10/card-util.c:1395
 msgid "Replace existing key? (y/N) "
 msgstr "是���代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1413 tools/gpg-card.c:3359
+#: g10/card-util.c:1412 tools/gpg-card.c:3363
 #, fuzzy
 #| msgid ""
 #| "Note: There is no guarantee that the card supports the requested size.\n"
@@ -1948,110 +1954,110 @@ msgstr ""
 "      如果金鑰產生失敗了, 煩請查閱你�片上的文件,\n"
 "      看看這張�片支�哪些尺寸.\n"
 
-#: g10/card-util.c:1434 g10/keygen.c:2581 sm/certreqgen-ui.c:180
+#: g10/card-util.c:1433 g10/keygen.c:2558 sm/certreqgen-ui.c:180
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "你想�用多大的金鑰尺寸? (%u) "
 
-#: g10/card-util.c:1444 g10/keygen.c:2504 g10/keygen.c:2536
+#: g10/card-util.c:1443 g10/keygen.c:2481 g10/keygen.c:2513
 #: 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:2589 sm/certreqgen-ui.c:185
+#: g10/card-util.c:1451 g10/keygen.c:2566 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:1470
 msgid "Changing card key attribute for: "
 msgstr ""
 
-#: g10/card-util.c:1473
+#: g10/card-util.c:1472
 #, fuzzy
 #| msgid "   (1) Signature key\n"
 msgid "Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1475
+#: g10/card-util.c:1474
 #, fuzzy
 #| msgid "   (2) Encryption key\n"
 msgid "Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1477
+#: g10/card-util.c:1476
 #, fuzzy
 #| msgid "   (3) Authentication key\n"
 msgid "Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1479 g10/keygen.c:2123 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1478 g10/keygen.c:2100 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:1479 sm/certreqgen-ui.c:159
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
 
-#: g10/card-util.c:1481
+#: g10/card-util.c:1480
 #, 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:2028 g10/keygen.c:2056 g10/keygen.c:2183
-#: g10/keygen.c:2436 g10/keygen.c:2724 g10/revoke.c:840
+#: g10/card-util.c:1495 g10/card-util.c:1762 g10/card-util.c:1862
+#: g10/keyedit.c:901 g10/keygen.c:2005 g10/keygen.c:2033 g10/keygen.c:2160
+#: g10/keygen.c:2413 g10/keygen.c:2701 g10/revoke.c:840
 msgid "Invalid selection.\n"
 msgstr "無效的�擇.\n"
 
-#: g10/card-util.c:1569
+#: g10/card-util.c:1568
 #, 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:1573
 #, 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:1609
 #, 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:1625 g10/card-util.c:2146 g10/card-util.c:2202
 #, 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:3088 tools/gpg-card.c:3327
-#: tools/gpg-card.c:3385
+#: g10/card-util.c:1631 g10/card-util.c:1976 g10/card-util.c:2152
+#: g10/card-util.c:2211 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:2457
+#: g10/card-util.c:1677 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:1691
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "請注�: 金鑰已經存放在�片上了!\n"
 
-#: g10/card-util.c:1695 tools/gpg-card.c:2429
+#: g10/card-util.c:1694 tools/gpg-card.c:2433
 msgid "Replace existing keys? (y/N) "
 msgstr "是���代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1707 tools/gpg-card.c:2488
+#: g10/card-util.c:1706 tools/gpg-card.c:2492
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -2062,189 +2068,189 @@ msgstr ""
 "   PIN = '%s'     管�者 PIN = '%s'\n"
 "你應該用 --change-pin 指令來加以變更\n"
 
-#: g10/card-util.c:1742
+#: g10/card-util.c:1741
 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:1743 g10/card-util.c:1833
 msgid "   (1) Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1745 g10/card-util.c:1836
+#: g10/card-util.c:1744 g10/card-util.c:1835
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1746 g10/card-util.c:1838
+#: g10/card-util.c:1745 g10/card-util.c:1837
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1831
+#: g10/card-util.c:1830
 msgid "Please select where to store the key:\n"
 msgstr "請�擇�把金鑰存放在哪裡:\n"
 
-#: g10/card-util.c:1877
+#: g10/card-util.c:1876
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD 失敗: %s\n"
 
-#: g10/card-util.c:1982 tools/gpg-card.c:3096
+#: g10/card-util.c:1981 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:3099 tools/gpg-card.c:3440
+#: g10/card-util.c:1984 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:3110
+#: g10/card-util.c:1989 tools/gpg-card.c:3114
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr ""
 
-#: g10/card-util.c:2183
+#: g10/card-util.c:2182
 #, 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:2228
 #, 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:3680
+#: g10/card-util.c:2252 g10/keyedit.c:1264 tools/gpg-card.c:3738
 msgid "quit this menu"
 msgstr "離開這個�單"
 
-#: g10/card-util.c:2255
+#: g10/card-util.c:2254
 msgid "show admin commands"
 msgstr "顯示管�者指令"
 
-#: g10/card-util.c:2256 g10/keyedit.c:1266 tools/gpg-card.c:3683
+#: g10/card-util.c:2255 g10/keyedit.c:1267 tools/gpg-card.c:3741
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
-#: g10/card-util.c:2258 tools/gpg-card.c:3685
+#: g10/card-util.c:2257 tools/gpg-card.c:3743
 msgid "list all available data"
 msgstr "列出所有�用的資料"
 
-#: g10/card-util.c:2261 tools/gpg-card.c:3687
+#: g10/card-util.c:2260 tools/gpg-card.c:3745
 msgid "change card holder's name"
 msgstr "變更�片�有人的�字"
 
-#: g10/card-util.c:2262 tools/gpg-card.c:3688
+#: g10/card-util.c:2261 tools/gpg-card.c:3746
 msgid "change URL to retrieve key"
 msgstr "變更�回金鑰的 URL"
 
-#: g10/card-util.c:2263 tools/gpg-card.c:3689
+#: g10/card-util.c:2262 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:3690
+#: g10/card-util.c:2263 tools/gpg-card.c:3748
 msgid "change the login name"
 msgstr "變更登入�稱"
 
-#: g10/card-util.c:2265 tools/gpg-card.c:3691
+#: g10/card-util.c:2264 tools/gpg-card.c:3749
 msgid "change the language preferences"
 msgstr "變更介�語言�好設定"
 
-#: g10/card-util.c:2266 tools/gpg-card.c:3692
+#: g10/card-util.c:2265 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:3694
+#: g10/card-util.c:2267 tools/gpg-card.c:3752
 msgid "change a CA fingerprint"
 msgstr "變更�個憑證中心 (CA) 的指紋"
 
-#: g10/card-util.c:2269 tools/gpg-card.c:3695
+#: g10/card-util.c:2268 tools/gpg-card.c:3753
 msgid "toggle the signature force PIN flag"
 msgstr "切�簽章是�強制使用個人識別碼 (PIN) 的旗標"
 
-#: g10/card-util.c:2270 tools/gpg-card.c:3696
+#: g10/card-util.c:2269 tools/gpg-card.c:3754
 msgid "generate new keys"
 msgstr "產生新的金鑰"
 
-#: g10/card-util.c:2271 tools/gpg-card.c:3697
+#: g10/card-util.c:2270 tools/gpg-card.c:3755
 msgid "menu to change or unblock the PIN"
 msgstr "變更或�設個人識別碼 (PIN) 的�單"
 
-#: g10/card-util.c:2272 tools/gpg-card.c:3698
+#: g10/card-util.c:2271 tools/gpg-card.c:3756
 msgid "verify the PIN and list all data"
 msgstr "驗證個人識別碼 (PIN) 並列出所有的資料"
 
-#: g10/card-util.c:2273 tools/gpg-card.c:3699
+#: g10/card-util.c:2272 tools/gpg-card.c:3757
 msgid "unblock the PIN using a Reset Code"
 msgstr "用�設碼來解�個人識別碼 (PIN)"
 
-#: g10/card-util.c:2274 tools/gpg-card.c:3703
+#: g10/card-util.c:2273 tools/gpg-card.c:3761
 msgid "destroy all keys and data"
 msgstr ""
 
-#: g10/card-util.c:2276
+#: g10/card-util.c:2275
 #, 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:2276
 #, fuzzy
 #| msgid "change the ownertrust"
 msgid "change the key attribute"
 msgstr "更改主觀信任"
 
-#: g10/card-util.c:2278 tools/gpg-card.c:3705
+#: g10/card-util.c:2277 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:3955
+#: g10/card-util.c:2401 tools/gpg-card.c:4017
 msgid "gpg/card> "
 msgstr "gpg/�片> "
 
-#: g10/card-util.c:2443
+#: g10/card-util.c:2442
 msgid "Admin-only command\n"
 msgstr "�管�者使用的指令\n"
 
-#: g10/card-util.c:2474
+#: g10/card-util.c:2473
 msgid "Admin commands are allowed\n"
 msgstr "�許使用管�者指令\n"
 
-#: g10/card-util.c:2476
+#: g10/card-util.c:2475
 msgid "Admin commands are not allowed\n"
 msgstr "未�許使用管�者指令\n"
 
-#: g10/card-util.c:2587 g10/keyedit.c:2275 tools/gpg-card.c:3845
-#: tools/gpg-card.c:4103
+#: g10/card-util.c:2586 g10/keyedit.c:2276 tools/gpg-card.c:3907
+#: tools/gpg-card.c:4167
 #, c-format
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
-#: g10/decrypt.c:186 g10/encrypt.c:1215
+#: g10/decrypt.c:186 g10/encrypt.c:1206
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個指令中沒有作用\n"
 
-#: g10/decrypt.c:242 g10/gpg.c:5387 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5343 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:2441 g10/export.c:2562
-#: g10/export.c:2708 g10/getkey.c:2032 g10/gpg.c:5332 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2685 g10/keyedit.c:4646 g10/keylist.c:707
+#: g10/delkey.c:81 g10/export.c:2285 g10/export.c:2774 g10/export.c:2895
+#: g10/export.c:2973 g10/getkey.c:2032 g10/gpg.c:5288 g10/keyedit.c:1451
+#: g10/keyedit.c:2383 g10/keyedit.c:2725 g10/keyedit.c:4538 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:4475
-#: g10/gpg.c:5341 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/delkey.c:90 g10/export.c:2320 g10/getkey.c:2040 g10/getkey.c:4475
+#: g10/gpg.c:5297 g10/keyedit.c:2355 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2303,9 +2309,9 @@ msgstr "金鑰"
 msgid "subkey"
 msgstr "�鑰"
 
-#: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2570 g10/keyedit.c:2636 g10/keyedit.c:2852 g10/keyedit.c:3082
-#: g10/keyedit.c:3151 g10/keyedit.c:3301
+#: g10/delkey.c:299 g10/keyedit.c:2248 g10/keyedit.c:2258 g10/keyedit.c:2436
+#: g10/keyedit.c:2571 g10/keyedit.c:2637 g10/keyedit.c:2684 g10/keyedit.c:2892
+#: g10/keyedit.c:3122 g10/keyedit.c:3191 g10/keyedit.c:3341
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失敗: %s\n"
@@ -2336,19 +2342,19 @@ msgid ""
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) �稱�編密法會��收件者�好設定\n"
 
-#: g10/encrypt.c:135 g10/encrypt.c:680
+#: g10/encrypt.c:135 g10/encrypt.c:671
 #, 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:138 g10/encrypt.c:683 g10/misc.c:400
+#: g10/encrypt.c:138 g10/encrypt.c:674 g10/misc.c:400
 #, c-format
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:148 g10/encrypt.c:691 g10/decrypt-data.c:265 g10/gpg.c:4131
-#: g10/gpg.c:4178 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
+#: g10/encrypt.c:148 g10/encrypt.c:682 g10/decrypt-data.c:265 g10/gpg.c:4085
+#: g10/gpg.c:4125 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1687
 #, 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"
@@ -2360,58 +2366,59 @@ msgstr "你�該將 '%s' 編密演算法用於 %s 模�\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "警告: \"%s%s\" 是已廢棄的�項 - 沒有效果\n"
 
-#: g10/encrypt.c:474 g10/sign.c:1622
+#: g10/encrypt.c:466 g10/sign.c:1622
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語時出錯: %s\n"
 
-#: g10/encrypt.c:481
-#, c-format
-msgid "can't use a symmetric ESK packet due to the S2K mode\n"
+#: g10/encrypt.c:473
+#, 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:512
+#: g10/encrypt.c:503
 #, fuzzy, c-format
 #| msgid "using cipher %s\n"
 msgid "using cipher %s.%s\n"
 msgstr "正在使用 %s 編密法\n"
 
-#: g10/encrypt.c:524 g10/encrypt.c:899
+#: g10/encrypt.c:515 g10/encrypt.c:890
 #, c-format
 msgid "'%s' already compressed\n"
 msgstr "'%s' 已經被壓縮了\n"
 
-#: g10/encrypt.c:585 g10/encrypt.c:936 g10/sign.c:833
+#: g10/encrypt.c:576 g10/encrypt.c:927 g10/sign.c:833
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "警告: '%s' 是個空檔案\n"
 
-#: g10/encrypt.c:700 g10/gpg.c:4143 g10/gpg.c:4190 g10/sig-check.c:184
+#: g10/encrypt.c:691 g10/gpg.c:4091 g10/gpg.c:4137 g10/sig-check.c:184
 #: g10/sign.c:452 sm/gpgsm.c:1697 sm/gpgsm.c:1707 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 "你�該將 '%s' 摘�演算法用於 %s 模�\n"
 
-#: g10/encrypt.c:862
+#: g10/encrypt.c:853
 #, c-format
 msgid "reading from '%s'\n"
 msgstr "正在從 '%s' 讀�\n"
 
-#: g10/encrypt.c:986 g10/sign.c:1273
+#: g10/encrypt.c:977 g10/sign.c:1273
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
 "preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會��收件者�好設定\n"
 
-#: g10/encrypt.c:1160
+#: g10/encrypt.c:1151
 #, 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:1190 g10/pkclist.c:1052 g10/pkclist.c:1103
+#: g10/encrypt.c:1181 g10/pkclist.c:1052 g10/pkclist.c:1103
 #, 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"
@@ -2439,61 +2446,73 @@ msgstr "警告: 訊�已用�稱�編密法的弱金鑰加密了.\n"
 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/export.c:1558 g10/import.c:2190 g10/openfile.c:202 g10/openfile.c:296
 #: g10/sign.c:1117 g10/sign.c:1456
 #, 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:2135
+#: g10/export.c:2468
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "警告: 沒有匯出任何�西\n"
 
-#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
+#: 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"
@@ -2560,7 +2579,7 @@ msgstr "無效的金鑰 %s �以藉由 --allow-non-selfsigned-uid 而生效\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用�鑰 %s 來替�主鑰 %s\n"
 
-#: g10/getkey.c:4404 g10/gpg.c:2192
+#: g10/getkey.c:4404 g10/gpg.c:2186
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
@@ -2640,113 +2659,113 @@ msgstr "快速產生新的金鑰�"
 msgid "quickly set a new expiration date"
 msgstr "快速產生新的金鑰�"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:496
 msgid "full featured key pair generation"
 msgstr "全能金鑰�生�"
 
-#: g10/gpg.c:498
+#: g10/gpg.c:499
 msgid "generate a revocation certificate"
 msgstr "產生撤銷憑證"
 
-#: g10/gpg.c:501 sm/gpgsm.c:238
+#: g10/gpg.c:502 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移除金鑰"
 
-#: g10/gpg.c:503
+#: g10/gpg.c:504
 msgid "remove keys from the secret keyring"
 msgstr "從�鑰鑰匙圈裡移除金鑰"
 
-#: g10/gpg.c:505
+#: g10/gpg.c:506
 msgid "quickly sign a key"
 msgstr "快速簽署金鑰"
 
-#: g10/gpg.c:507
+#: g10/gpg.c:508
 msgid "quickly sign a key locally"
 msgstr "快速在本機簽署金鑰"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "快速產生新的金鑰�"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key"
 msgstr "簽署金鑰"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign a key locally"
 msgstr "僅在本機簽署金鑰"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:513
 msgid "sign or edit a key"
 msgstr "簽署或編輯金鑰"
 
-#: g10/gpg.c:514 sm/gpgsm.c:256
+#: g10/gpg.c:515 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "更改密語"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "export keys to a keyserver"
 msgstr "把金鑰匯出至金鑰伺�器"
 
-#: g10/gpg.c:520
+#: g10/gpg.c:521
 msgid "import keys from a keyserver"
 msgstr "從金鑰伺�器匯入金鑰"
 
-#: g10/gpg.c:523
+#: g10/gpg.c:524
 msgid "search for keys on a keyserver"
 msgstr "在金鑰伺�器上�尋金鑰"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "update all keys from a keyserver"
 msgstr "從金鑰伺�器更新所有的金鑰"
 
-#: g10/gpg.c:534
+#: g10/gpg.c:535
 msgid "import/merge keys"
 msgstr "匯入/�併金鑰"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "print the card status"
 msgstr "列��片狀態"
 
-#: g10/gpg.c:538
+#: g10/gpg.c:539
 msgid "change data on a card"
 msgstr "變更�片上的資料"
 
-#: g10/gpg.c:540
+#: g10/gpg.c:541
 msgid "change a card's PIN"
 msgstr "變更�片的個人識別碼 (PIN)"
 
-#: g10/gpg.c:552
+#: g10/gpg.c:553
 msgid "update the trust database"
 msgstr "更新信任資料庫"
 
-#: g10/gpg.c:562
+#: g10/gpg.c:563
 msgid "print message digests"
 msgstr "�出訊�摘�"
 
-#: g10/gpg.c:566 sm/gpgsm.c:251
+#: g10/gpg.c:567 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "以伺�器模�執行"
 
-#: g10/gpg.c:568
+#: g10/gpg.c:569
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:611
+#: g10/gpg.c:612
 msgid "|NAME|use NAME as default secret key"
 msgstr "|�字|使用指定�字�為�設�鑰"
 
-#: g10/gpg.c:613 sm/gpgsm.c:347
+#: g10/gpg.c:614 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|�字|也加密給指定�字的使用者 ID"
 
-#: g10/gpg.c:621
+#: g10/gpg.c:622
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|設定電�郵件別�"
 
@@ -2762,61 +2781,61 @@ msgstr "���任何改變"
 msgid "prompt before overwriting"
 msgstr "覆寫�先詢�"
 
-#: g10/gpg.c:709 sm/gpgsm.c:317
+#: g10/gpg.c:708 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "控制著安全性的�項"
 
-#: g10/gpg.c:727 sm/gpgsm.c:327
+#: g10/gpg.c:726 sm/gpgsm.c:327
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "控制著診斷性輸出的�項"
 
-#: g10/gpg.c:729 sm/gpgsm.c:329
+#: g10/gpg.c:728 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "建立以 ASCII ���的輸出"
 
-#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
+#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|檔案|將輸出寫入至指定檔案"
 
-#: g10/gpg.c:746
+#: g10/gpg.c:745
 msgid "use canonical text mode"
 msgstr "使用標準的文字模�"
 
-#: g10/gpg.c:764
+#: g10/gpg.c:763
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示�壓縮)"
 
-#: g10/gpg.c:770 sm/gpgsm.c:364
+#: g10/gpg.c:769 sm/gpgsm.c:364
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
 msgstr "控制著互動�強制執行的�項"
 
-#: g10/gpg.c:773
+#: g10/gpg.c:772
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|使用 MECHANISMS 機制來從郵件地�找出金鑰"
 
-#: g10/gpg.c:776
+#: g10/gpg.c:775
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "從金鑰伺�器匯入金鑰"
 
-#: g10/gpg.c:781
+#: g10/gpg.c:780
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:784 sm/gpgsm.c:367
+#: g10/gpg.c:783 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "�用所有的 dirmngr 存�"
 
-#: g10/gpg.c:796 sm/gpgsm.c:374
+#: g10/gpg.c:795 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
@@ -2844,7 +2863,7 @@ msgstr ""
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:976 sm/gpgsm.c:460
+#: g10/gpg.c:978 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2852,7 +2871,7 @@ msgstr ""
 "@\n"
 "(請�照線上說明��來�得所有命令和�項的完整清單)\n"
 
-#: g10/gpg.c:979
+#: g10/gpg.c:981
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2882,11 +2901,11 @@ msgstr ""
 " --list-keys [�字]         顯示金鑰\n"
 " --fingerprint [�字]       顯示指紋\n"
 
-#: g10/gpg.c:1172
+#: g10/gpg.c:1169
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "用法: @GPG@ [�項] [檔案] (或用 -h 求助)"
 
-#: g10/gpg.c:1175
+#: g10/gpg.c:1172
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2896,7 +2915,7 @@ msgstr ""
 "簽署, 檢查, 加密, 解密\n"
 "�設的�作會�輸入資料而定\n"
 
-#: g10/gpg.c:1186 sm/gpgsm.c:651
+#: g10/gpg.c:1183 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2904,567 +2923,555 @@ msgstr ""
 "\n"
 "已支�的演算法:\n"
 
-#: g10/gpg.c:1189
+#: g10/gpg.c:1186
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:1196 g10/keyedit.c:3375
+#: g10/gpg.c:1193 g10/keylist.c:391
 msgid "Cipher: "
 msgstr "編密法: "
 
-#: g10/gpg.c:1210
+#: g10/gpg.c:1200
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:1217 g10/keyedit.c:3441
+#: g10/gpg.c:1207 g10/keylist.c:454
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:1292 sm/gpgsm.c:725
+#: g10/gpg.c:1282 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "用法: %s [�項] %s\n"
 
-#: g10/gpg.c:1491 sm/gpgsm.c:818
+#: g10/gpg.c:1481 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/gpg.c:1509
+#: g10/gpg.c:1499
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "在群組定義 '%s' 裡找�到 = 記號\n"
 
-#: g10/gpg.c:1708
+#: g10/gpg.c:1698
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的所有權並�安全\n"
 
-#: g10/gpg.c:1711
+#: g10/gpg.c:1701
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的所有權並�安全\n"
 
-#: g10/gpg.c:1714
+#: g10/gpg.c:1704
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的所有權並�安全\n"
 
-#: g10/gpg.c:1720
+#: g10/gpg.c:1710
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的權�並�安全\n"
 
-#: g10/gpg.c:1723
+#: g10/gpg.c:1713
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的權�並�安全\n"
 
-#: g10/gpg.c:1726
+#: g10/gpg.c:1716
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的權�並�安全\n"
 
-#: g10/gpg.c:1732
+#: g10/gpg.c:1722
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的�入目錄所有權並�安全\n"
 
-#: g10/gpg.c:1735
+#: g10/gpg.c:1725
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的�入目錄所有權並�安全\n"
 
-#: g10/gpg.c:1738
+#: g10/gpg.c:1728
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的�入目錄所有權並�安全\n"
 
-#: g10/gpg.c:1744
+#: g10/gpg.c:1734
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的�入目錄權�並�安全\n"
 
-#: g10/gpg.c:1747
+#: g10/gpg.c:1737
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的�入目錄權�並�安全\n"
 
-#: g10/gpg.c:1750
+#: g10/gpg.c:1740
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的�入目錄權�並�安全\n"
 
-#: g10/gpg.c:1966
+#: g10/gpg.c:1956
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "未知的組態項目 '%s'\n"
 
-#: g10/gpg.c:2062
+#: g10/gpg.c:2052
 msgid "display photo IDs during key listings"
 msgstr "列出金鑰時顯示照片 ID"
 
-#: g10/gpg.c:2064
+#: g10/gpg.c:2054
 msgid "show key usage information during key listings"
 msgstr "列出金鑰時顯示金鑰用途資訊"
 
-#: g10/gpg.c:2066
+#: g10/gpg.c:2056
 msgid "show policy URLs during signature listings"
 msgstr "列出簽章時顯示原則 URL"
 
-#: g10/gpg.c:2068
+#: g10/gpg.c:2058
 msgid "show all notations during signature listings"
 msgstr "列出簽章時顯示所有的註記"
 
-#: g10/gpg.c:2070
+#: g10/gpg.c:2060
 msgid "show IETF standard notations during signature listings"
 msgstr "列出簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:2074
+#: g10/gpg.c:2064
 msgid "show user-supplied notations during signature listings"
 msgstr "列出簽章時顯示使用者�供的註記"
 
-#: g10/gpg.c:2076
+#: g10/gpg.c:2066
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出簽章時顯示�好的金鑰伺�器 URL"
 
-#: g10/gpg.c:2078
+#: g10/gpg.c:2068
 msgid "show user ID validity during key listings"
 msgstr "列出金鑰時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:2080
+#: g10/gpg.c:2070
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出金鑰時顯示已撤銷或�期的使用者 ID"
 
-#: g10/gpg.c:2082
+#: g10/gpg.c:2072
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出金鑰時顯示已撤銷或�期的�鑰"
 
-#: g10/gpg.c:2084
+#: g10/gpg.c:2074
 msgid "show the keyring name in key listings"
 msgstr "在金鑰清單中顯示鑰匙圈�稱"
 
-#: g10/gpg.c:2086
+#: g10/gpg.c:2076
 msgid "show expiration dates during signature listings"
 msgstr "列出簽章時顯示有效期�"
 
-#: g10/gpg.c:2203
+#: g10/gpg.c:2078 g10/gpg.c:2080
+#, fuzzy
+#| msgid "list preferences (expert)"
+msgid "show preferences"
+msgstr "列出�好 (專家模�)"
+
+#: g10/gpg.c:2197
 #, fuzzy, c-format
 #| msgid "unknown option '%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "未知的�項 '%s'\n"
 
-#: g10/gpg.c:2205
+#: g10/gpg.c:2199
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2320 g10/keyedit.c:1724
+#: g10/gpg.c:2289 g10/keyedit.c:1725
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模�中��許使用這個指令.\n"
 
-#: g10/gpg.c:3008 g10/gpg.c:3866 g10/gpg.c:3878
+#: g10/gpg.c:2983 g10/gpg.c:3834 g10/gpg.c:3846
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "請注�: 一般情�下�採用 %s!\n"
 
-#: g10/gpg.c:3186 g10/gpg.c:3198
+#: g10/gpg.c:3160 g10/gpg.c:3172
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' �是有效的簽章使用期�\n"
 
-#: g10/gpg.c:3220
+#: g10/gpg.c:3194
 #, 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:3252 sm/gpgsm.c:1157
+#: g10/gpg.c:3226 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "無效的個人識別碼項目模� '%s'\n"
 
-#: g10/gpg.c:3258 sm/gpgsm.c:1163
+#: g10/gpg.c:3232 sm/gpgsm.c:1163
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "invalid request origin '%s'\n"
 msgstr "�項 \"%.50s\" 的引數無效\n"
 
-#: g10/gpg.c:3315
+#: g10/gpg.c:3286
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' �是有效的字元集\n"
 
-#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5389
+#: g10/gpg.c:3308 g10/gpg.c:3522 g10/keyedit.c:5283
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖�金鑰伺�器 URL\n"
 
-#: g10/gpg.c:3355
+#: g10/gpg.c:3326
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺�器�項\n"
 
-#: g10/gpg.c:3358
+#: g10/gpg.c:3329
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺�器�項\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3336
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入�項\n"
 
-#: g10/gpg.c:3368
+#: g10/gpg.c:3339
 #, c-format
 msgid "invalid import options\n"
 msgstr "無效的匯入�項\n"
 
-#: g10/gpg.c:3374 g10/gpg.c:3389
+#: g10/gpg.c:3345 g10/gpg.c:3360 g10/gpg.c:3365
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "無效的清單�項\n"
 
-#: g10/gpg.c:3380
+#: g10/gpg.c:3351
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出�項\n"
 
-#: g10/gpg.c:3383
+#: g10/gpg.c:3354
 #, c-format
 msgid "invalid export options\n"
 msgstr "無效的匯出�項\n"
 
-#: g10/gpg.c:3395
+#: g10/gpg.c:3371
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單�項\n"
 
-#: g10/gpg.c:3398
+#: g10/gpg.c:3374
 #, c-format
 msgid "invalid list options\n"
 msgstr "無效的清單�項\n"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3382
 msgid "display photo IDs during signature verification"
 msgstr "驗證簽章時顯示照片 ID"
 
-#: g10/gpg.c:3408
+#: g10/gpg.c:3384
 msgid "show policy URLs during signature verification"
 msgstr "驗證簽章時顯示原則 URL"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3386
 msgid "show all notations during signature verification"
 msgstr "驗證簽章時顯示所有的註記"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3388
 msgid "show IETF standard notations during signature verification"
 msgstr "驗證簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3392
 msgid "show user-supplied notations during signature verification"
 msgstr "驗證簽章時顯示使用者�供的註記"
 
-#: g10/gpg.c:3418
+#: g10/gpg.c:3394
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "驗證簽章時顯示�好的金鑰伺�器 URL"
 
-#: g10/gpg.c:3420
+#: g10/gpg.c:3396
 msgid "show user ID validity during signature verification"
 msgstr "驗證簽章時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:3422
+#: g10/gpg.c:3398
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "驗證簽章時顯示已撤銷或�期的使用者 ID"
 
-#: g10/gpg.c:3424
+#: g10/gpg.c:3400
 msgid "show only the primary user ID in signature verification"
 msgstr "驗證簽章時祇顯示主�的使用者 ID"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3407
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證�項\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3410
 #, c-format
 msgid "invalid verify options\n"
 msgstr "無效的驗證�項\n"
 
-#: g10/gpg.c:3441
+#: g10/gpg.c:3417
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設� %s\n"
 
-#: g10/gpg.c:3648
+#: g10/gpg.c:3621
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的自動金鑰定�清單\n"
 
-#: g10/gpg.c:3651
+#: g10/gpg.c:3624
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "無效的自動金鑰定�清單\n"
 
-#: g10/gpg.c:3660
+#: g10/gpg.c:3633
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "�項 \"%.50s\" 的引數無效\n"
 
-#: g10/gpg.c:3850 sm/gpgsm.c:1566
+#: g10/gpg.c:3823 sm/gpgsm.c:1566
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程��能會傾�出核心檔!\n"
 
-#: g10/gpg.c:3859
+#: g10/gpg.c:3827
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會推翻 %s\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3836
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ��許跟 %s 併用!\n"
 
-#: g10/gpg.c:3871
+#: g10/gpg.c:3839
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有�義!\n"
 
-#: g10/gpg.c:3886 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
+#: g10/gpg.c:3854 sm/gpgsm.c:1587 dirmngr/dirmngr.c:1211
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "警告: 正在�造的系統時間中執行: "
 
-#: g10/gpg.c:3907
+#: g10/gpg.c:3875
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而�會在�安全的記憶體中執行\n"
 
-#: g10/gpg.c:3945 g10/gpg.c:3976 sm/gpgsm.c:1657
+#: g10/gpg.c:3915 g10/gpg.c:3939 sm/gpgsm.c:1657
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所�的編密演算法無效\n"
 
-#: g10/gpg.c:3952
-#, fuzzy, c-format
-#| msgid "selected digest algorithm is invalid\n"
-msgid "selected AEAD algorithm is invalid\n"
-msgstr "所�的摘�演算法無效\n"
-
-#: g10/gpg.c:3964
+#: g10/gpg.c:3927
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "所�的壓縮演算法無效\n"
 
-#: g10/gpg.c:3970
+#: g10/gpg.c:3933
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所�的憑證摘�演算法無效\n"
 
-#: g10/gpg.c:3985
+#: g10/gpg.c:3948
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定�大於 0\n"
 
-#: g10/gpg.c:3987
+#: g10/gpg.c:3950
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定�大於 1\n"
 
-#: g10/gpg.c:3989
+#: g10/gpg.c:3952
 #, 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:3991
+#: g10/gpg.c:3954
 #, 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:3993
+#: g10/gpg.c:3956
 #, 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:3997
+#: g10/gpg.c:3960
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注�: 強烈�建議使用單純 S2K 模� (0)\n"
 
-#: g10/gpg.c:4001
+#: g10/gpg.c:3964
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模�; 一定�是 0, 1 或 3\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:3971
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "無效的�設�好\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:3975
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法�好\n"
 
-#: g10/gpg.c:4015
-#, fuzzy, c-format
-#| msgid "invalid personal cipher preferences\n"
-msgid "invalid personal AEAD preferences\n"
-msgstr "無效的個人編密法�好\n"
-
-#: g10/gpg.c:4019
+#: g10/gpg.c:3979
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘��好\n"
 
-#: g10/gpg.c:4023
+#: g10/gpg.c:3983
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮�好\n"
 
-#: g10/gpg.c:4032 g10/gpg.c:4037
+#: g10/gpg.c:3992 g10/gpg.c:3997
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "金鑰尺寸無效; 改用 %u �元\n"
 
-#: g10/gpg.c:4074
+#: g10/gpg.c:4034
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起�作\n"
 
-#: g10/gpg.c:4137
-#, 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:4149
+#: g10/gpg.c:4097
 #, 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:4304
+#: g10/gpg.c:4251
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:4316
+#: g10/gpg.c:4263
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:4388
+#: g10/gpg.c:4336
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "'%s' �稱�加密失敗: %s\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4365
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "你�能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:4420
+#: g10/gpg.c:4368
 #, 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:4478
+#: g10/gpg.c:4426
 #, 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:4481
+#: g10/gpg.c:4429
 #, 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:4881 g10/keyserver.c:1631
+#: g10/gpg.c:4837 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�至金鑰伺�器失敗: %s\n"
 
-#: g10/gpg.c:4886
+#: g10/gpg.c:4842
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺�器接收失敗: %s\n"
 
-#: g10/gpg.c:4892
+#: g10/gpg.c:4848
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:4905 g10/gpg.c:4916
+#: g10/gpg.c:4861 g10/gpg.c:4872
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:4928
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "用金鑰伺�器�尋失敗: %s\n"
 
-#: g10/gpg.c:4941
+#: g10/gpg.c:4897
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺�器更新失敗: %s\n"
 
-#: g10/gpg.c:5010
+#: g10/gpg.c:4966
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開��失敗: %s\n"
 
-#: g10/gpg.c:5021
+#: g10/gpg.c:4977
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行��失敗: %s\n"
 
-#: g10/gpg.c:5147
+#: g10/gpg.c:5103
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "無效的雜湊演算法 '%s'\n"
 
-#: g10/gpg.c:5299 g10/tofu.c:2160
+#: g10/gpg.c:5255 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:5310
+#: g10/gpg.c:5266
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5366
+#: g10/gpg.c:5322
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5377
+#: g10/gpg.c:5333
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始輸入你的訊� ...\n"
 
-#: g10/gpg.c:5724
+#: g10/gpg.c:5680
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:5726
+#: g10/gpg.c:5682
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:5759
+#: g10/gpg.c:5715
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的�好金鑰伺�器 URL 無效\n"
@@ -3477,7 +3484,7 @@ msgstr "|檔案|從指定鑰匙圈檔案裡�用金鑰"
 msgid "make timestamp conflicts only a warning"
 msgstr "僅把時間戳�矛盾視為警告"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:96
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:97
 msgid "|FD|write status info to this FD"
 msgstr "|檔案�述|把狀態資訊寫入此指定檔案�述"
 
@@ -3506,338 +3513,338 @@ msgstr "沒有�用的說明"
 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:1998 g10/import.c:3146
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "金鑰 %s: 沒有使用者 ID\n"
 
-#: g10/import.c:1946
+#: g10/import.c:2004
 #, c-format
 msgid "key %s: %s\n"
 msgstr "金鑰 %s: %s\n"
 
-#: g10/import.c:1947 g10/import.c:3049
+#: g10/import.c:2005 g10/import.c:3118
 msgid "rejected by import screener"
 msgstr "�到匯入篩�程��回"
 
-#: g10/import.c:1996
+#: g10/import.c:2054
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "金鑰 %s: PKS �鑰的訛誤已被修復\n"
 
-#: g10/import.c:2017
+#: g10/import.c:2075
 #, 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:2086 g10/import.c:2117
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 
-#: g10/import.c:2030
+#: g10/import.c:2088
 #, 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:2167 g10/import.c:3533
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "金鑰 %s: 找�到公鑰: %s\n"
 
-#: g10/import.c:2115
+#: g10/import.c:2173
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "金鑰 %s: 新的金鑰 - 已跳�\n"
 
-#: g10/import.c:2127
+#: g10/import.c:2185
 #, 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:2217 g10/import.c:2319 g10/import.c:3608
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "寫入鑰匙圈 '%s' 時出錯: %s\n"
 
-#: g10/import.c:2182
+#: g10/import.c:2240
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
 
-#: g10/import.c:2209
+#: g10/import.c:2267
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "金鑰 %s: 跟我們的副本���\n"
 
-#: g10/import.c:2277
+#: g10/import.c:2335
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
 
-#: g10/import.c:2280
+#: g10/import.c:2338
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
 
-#: g10/import.c:2283
+#: g10/import.c:2341
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "金鑰 %s: \"%s\" 1 份新的簽章\n"
 
-#: g10/import.c:2286
+#: g10/import.c:2344
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "金鑰 %s: \"%s\" %d 份新的簽章\n"
 
-#: g10/import.c:2289
+#: g10/import.c:2347
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "金鑰 %s: \"%s\" 1 把新的�鑰\n"
 
-#: g10/import.c:2292
+#: g10/import.c:2350
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "金鑰 %s: \"%s\" %d 把新的�鑰\n"
 
-#: g10/import.c:2295
+#: g10/import.c:2353
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
 
-#: g10/import.c:2298
+#: g10/import.c:2356
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
 
-#: g10/import.c:2301
+#: g10/import.c:2359
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
 
-#: g10/import.c:2304
+#: g10/import.c:2362
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
 
-#: g10/import.c:2340
+#: g10/import.c:2398
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "金鑰 %s: \"%s\" 未改變\n"
 
-#: g10/import.c:2716 g10/import.c:2911
+#: g10/import.c:2785 g10/import.c:2980
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "金鑰 %s: �鑰已匯入\n"
 
-#: g10/import.c:2724
+#: g10/import.c:2793
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "金鑰 %s: �鑰已存在\n"
 
-#: g10/import.c:2732
+#: g10/import.c:2801
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "金鑰 %s: �至代�程�時出錯: %s\n"
@@ -3850,142 +3857,142 @@ msgstr "金鑰 %s: �至代�程�時出錯: %s\n"
 #. * 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:2970
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr ""
 
-#: g10/import.c:3048
+#: g10/import.c:3117
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "�鑰 %s: %s\n"
 
-#: g10/import.c:3069 g10/import.c:3108
+#: g10/import.c:3138 g10/import.c:3177
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "未�許匯入�鑰\n"
 
-#: g10/import.c:3096
+#: g10/import.c:3165
 #, 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:3327 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:3328 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:3329 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:3330 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:3331 g10/pkclist.c:83 g10/revoke.c:779
 msgid "User ID is no longer valid"
 msgstr "使用者 ID ��有效了"
 
-#: g10/import.c:3387 g10/keylist.c:1116 g10/pkclist.c:87
+#: g10/import.c:3456 g10/keylist.c:1338 g10/pkclist.c:87
 #, c-format
 msgid "reason for revocation: "
 msgstr "撤銷原因: "
 
-#: g10/import.c:3406 g10/keylist.c:1135 g10/pkclist.c:103
+#: g10/import.c:3475 g10/keylist.c:1357 g10/pkclist.c:103
 #, c-format
 msgid "revocation comment: "
 msgstr "撤銷註釋: "
 
-#: g10/import.c:3456
+#: g10/import.c:3526
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
 
-#: g10/import.c:3485
+#: g10/import.c:3555
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "金鑰 %s: 無法定�原始的金鑰�塊: %s\n"
 
-#: g10/import.c:3492
+#: g10/import.c:3562
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "金鑰 %s: 無法讀�原始的金鑰�塊: %s\n"
 
-#: g10/import.c:3512
+#: g10/import.c:3582
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已�回\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3617
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3703
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
 
-#: g10/import.c:3650
+#: g10/import.c:3720
 #, 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:3722
 #, 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:3739 g10/import.c:3767 g10/import.c:3823
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "金鑰 %s: 未支�的公鑰演算法\n"
 
-#: g10/import.c:3670
+#: g10/import.c:3740
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "金鑰 %s: 無效的直接金鑰簽章\n"
 
-#: g10/import.c:3684
+#: g10/import.c:3754
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "金鑰 %s: 沒有�供附帶的�鑰\n"
 
-#: g10/import.c:3699
+#: g10/import.c:3769
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "金鑰 %s: 無效的附帶�鑰\n"
 
-#: g10/import.c:3718
+#: g10/import.c:3788
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "金鑰 %s: 多�附帶�鑰已移除\n"
 
-#: g10/import.c:3742
+#: g10/import.c:3812
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "金鑰 %s: 沒有�鑰�供金鑰撤銷\n"
 
-#: g10/import.c:3755
+#: g10/import.c:3825
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "金鑰 %s: 無效的�鑰撤銷\n"
 
-#: g10/import.c:3770
+#: g10/import.c:3840
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "金鑰 %s: 多��鑰撤銷已移除\n"
 
-#: g10/import.c:3814
+#: g10/import.c:3887
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳�\n"
 
-#: g10/import.c:3841
+#: g10/import.c:3914
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "金鑰 %s: �鑰已跳�\n"
@@ -3994,58 +4001,58 @@ msgstr "金鑰 %s: �鑰已跳�\n"
 #  * 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:3946
 #, 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:3957
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳�\n"
 
-#: g10/import.c:3902
+#: g10/import.c:3985
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳�\n"
 
-#: g10/import.c:3916
+#: g10/import.c:4009
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "金鑰 %s: �鑰簽章在錯誤的地方 - 已跳�\n"
 
-#: g10/import.c:3924
+#: g10/import.c:4017
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "金鑰 %s: ��期的簽章等級 (0x%02X) - 已跳�\n"
 
-#: g10/import.c:4097
+#: g10/import.c:4190
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "金鑰 %s: �測到�複的使用者 ID - 已�併\n"
 
-#: g10/import.c:4204
+#: g10/import.c:4297
 #, 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:4362
 #, 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:4378
 #, 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:4444
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
 
-#: g10/import.c:4389
+#: g10/import.c:4482
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
@@ -4087,14 +4094,14 @@ msgid "%d duplicate signature removed\n"
 msgid_plural "%d duplicate signatures removed\n"
 msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 
-#: g10/key-check.c:726 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"
 msgstr[0] "有 1 份簽章因為�失金鑰而未被檢查\n"
 
-#: g10/key-check.c:734 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,15 +4152,15 @@ msgstr "金鑰�塊資� '%s': %s\n"
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "�新建立鑰匙圈快�失敗: %s\n"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[revocation]"
 msgstr "[撤銷]"
 
-#: g10/keyedit.c:261
+#: g10/keyedit.c:262
 msgid "[self-signature]"
 msgstr "[自我簽章]"
 
-#: g10/keyedit.c:384 g10/pkclist.c:277
+#: g10/keyedit.c:385 g10/pkclist.c:277
 msgid ""
 "Please decide how far you trust this user to correctly verify other users' "
 "keys\n"
@@ -4163,17 +4170,17 @@ msgstr ""
 "請判斷你有多信任這�使用者確實驗證其他使用者的金鑰\n"
 "(�是查�身份證, 或從��的來�檢查指紋等...）的能力\n"
 
-#: g10/keyedit.c:388 g10/pkclist.c:289
+#: g10/keyedit.c:389 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:390 g10/pkclist.c:291
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全信任\n"
 
-#: g10/keyedit.c:407
+#: g10/keyedit.c:408
 msgid ""
 "Please enter the depth of this trust signature.\n"
 "A depth greater than 1 allows the key you are signing to make\n"
@@ -4183,50 +4190,50 @@ msgstr ""
 "深度大於 1 的話就表示你信任這把正被簽署的金鑰,\n"
 "�時也信任這把金鑰所簽署的信任簽章.\n"
 
-#: g10/keyedit.c:424
+#: g10/keyedit.c:425
 msgid "Please enter a domain to restrict this signature, or enter for none.\n"
 msgstr "請輸入約�此簽章的網域, 若無請直接按下 [Enter].\n"
 
-#: g10/keyedit.c:552
+#: g10/keyedit.c:553
 #, c-format
 msgid "Skipping user ID \"%s\", which is not a text ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:560
+#: g10/keyedit.c:561
 #, 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:570 g10/keyedit.c:598 g10/keyedit.c:625 g10/keyedit.c:810
+#: g10/keyedit.c:1662
 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:2762
+#: g10/keyedit.c:584 g10/keyedit.c:612 g10/keyedit.c:639 g10/keyedit.c:816
+#: g10/keyedit.c:1667 g10/keyedit.c:2802
 msgid "  Unable to sign.\n"
 msgstr "  無法簽署.\n"
 
-#: g10/keyedit.c:588
+#: g10/keyedit.c:589
 #, c-format
 msgid "User ID \"%s\" is expired."
 msgstr "使用者 ID \"%s\" 已�期."
 
-#: g10/keyedit.c:616
+#: g10/keyedit.c:617
 #, c-format
 msgid "User ID \"%s\" is not self-signed."
 msgstr "使用者 ID \"%s\" 未經自我簽署."
 
-#: g10/keyedit.c:645
+#: g10/keyedit.c:646
 #, c-format
 msgid "User ID \"%s\" is signable.  "
 msgstr "使用者 ID \"%s\" �被簽署."
 
-#: g10/keyedit.c:647
+#: g10/keyedit.c:648
 msgid "Sign it? (y/N) "
 msgstr "是��簽署? (y/N) "
 
-#: g10/keyedit.c:674
+#: g10/keyedit.c:675
 #, c-format
 msgid ""
 "The self-signature on \"%s\"\n"
@@ -4235,11 +4242,11 @@ msgstr ""
 "\"%s\" 裡的自我簽章\n"
 "是 PGP 2.x 型態的簽章.\n"
 
-#: g10/keyedit.c:683
+#: g10/keyedit.c:684
 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:697
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4248,11 +4255,11 @@ msgstr ""
 "你目�在 \"%s\" 的簽章\n"
 "已經�期了.\n"
 
-#: g10/keyedit.c:701
+#: g10/keyedit.c:702
 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:723
 #, c-format
 msgid ""
 "Your current signature on \"%s\"\n"
@@ -4261,43 +4268,43 @@ msgstr ""
 "你目�在 \"%s\" 的簽章\n"
 "是一份本機簽章.\n"
 
-#: g10/keyedit.c:727
+#: g10/keyedit.c:728
 msgid "Do you want to promote it to a full exportable signature? (y/N) "
 msgstr "你是�想�把他�級��以完全匯出的簽章? (y/N) "
 
-#: g10/keyedit.c:747
+#: g10/keyedit.c:748
 #, c-format
 msgid "\"%s\" was already locally signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 在本機簽署了\n"
 
-#: g10/keyedit.c:751
+#: g10/keyedit.c:752
 #, c-format
 msgid "\"%s\" was already signed by key %s\n"
 msgstr "\"%s\" 已經被金鑰 %s 簽署了\n"
 
-#: g10/keyedit.c:757
+#: g10/keyedit.c:758
 msgid "Do you want to sign it again anyway? (y/N) "
 msgstr "你�然想��次簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:780
 #, c-format
 msgid "Nothing to sign with key %s\n"
 msgstr "沒有�西�以讓金鑰 %s 簽署\n"
 
-#: g10/keyedit.c:803
+#: g10/keyedit.c:804
 msgid "This key has expired!"
 msgstr "這把金鑰已經�期了!"
 
-#: g10/keyedit.c:821
+#: g10/keyedit.c:822
 #, c-format
 msgid "This key is due to expire on %s.\n"
 msgstr "這把金鑰將在 %s �期.\n"
 
-#: g10/keyedit.c:827
+#: g10/keyedit.c:828
 msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "你想�讓你的簽章也在�一個時候�期嗎? (Y/n) "
 
-#: g10/keyedit.c:868
+#: g10/keyedit.c:869
 msgid ""
 "How carefully have you verified the key you are about to sign actually "
 "belongs\n"
@@ -4306,31 +4313,31 @@ msgstr ""
 "你有多謹慎檢查正�簽署的金鑰確實屬於上�那個人的�字呢?\n"
 "如果你�知�這個�題的答案, 請輸入 \"0\".\n"
 
-#: g10/keyedit.c:873
+#: g10/keyedit.c:874
 #, c-format
 msgid "   (0) I will not answer.%s\n"
 msgstr "   (0) 我�作答.%s\n"
 
-#: g10/keyedit.c:875
+#: g10/keyedit.c:876
 #, c-format
 msgid "   (1) I have not checked at all.%s\n"
 msgstr "   (1) 我根本沒有檢查�.%s\n"
 
-#: g10/keyedit.c:877
+#: g10/keyedit.c:878
 #, c-format
 msgid "   (2) I have done casual checking.%s\n"
 msgstr "   (2) 我隨�檢查�了.%s\n"
 
-#: g10/keyedit.c:880
+#: g10/keyedit.c:881
 #, c-format
 msgid "   (3) I have done very careful checking.%s\n"
 msgstr "   (3) 我�常�心地檢查�了.%s\n"
 
-#: g10/keyedit.c:887
+#: g10/keyedit.c:888
 msgid "Your selection? (enter '?' for more information): "
 msgstr "你的�擇是? (輸入 '?' 以�得更多資訊): "
 
-#: g10/keyedit.c:914
+#: g10/keyedit.c:915
 #, c-format
 msgid ""
 "Are you sure that you want to sign this key with your\n"
@@ -4339,230 +4346,230 @@ msgstr ""
 "你真的確定�用你的金鑰 \"%s\" (%s)\n"
 "來簽署這把金鑰嗎\n"
 
-#: g10/keyedit.c:922
+#: g10/keyedit.c:923
 msgid "This will be a self-signature.\n"
 msgstr "這將會是一份自我簽章.\n"
 
-#: g10/keyedit.c:927
+#: g10/keyedit.c:928
 msgid "WARNING: the signature will not be marked as non-exportable.\n"
 msgstr "警告: 這份簽章�會被標記為��匯出.\n"
 
-#: g10/keyedit.c:934
+#: g10/keyedit.c:935
 msgid "WARNING: the signature will not be marked as non-revocable.\n"
 msgstr "警告: 這份簽章�會被標記���撤銷.\n"
 
-#: g10/keyedit.c:944
+#: g10/keyedit.c:945
 msgid "The signature will be marked as non-exportable.\n"
 msgstr "這份簽章會被標記���匯出.\n"
 
-#: g10/keyedit.c:951
+#: g10/keyedit.c:952
 msgid "The signature will be marked as non-revocable.\n"
 msgstr "這份簽章會被標記���撤銷.\n"
 
-#: g10/keyedit.c:958
+#: g10/keyedit.c:959
 msgid "I have not checked this key at all.\n"
 msgstr "我根本沒有檢查�這把金鑰.\n"
 
-#: g10/keyedit.c:963
+#: g10/keyedit.c:964
 msgid "I have checked this key casually.\n"
 msgstr "我隨�檢查�這把金鑰了.\n"
 
-#: g10/keyedit.c:968
+#: g10/keyedit.c:969
 msgid "I have checked this key very carefully.\n"
 msgstr "我�常�心地檢查�這把金鑰了.\n"
 
-#: g10/keyedit.c:980
+#: g10/keyedit.c:981
 msgid "Really sign? (y/N) "
 msgstr "真的�簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6267 g10/keyedit.c:6350 g10/keyedit.c:6479
-#: g10/keyedit.c:6541 g10/sign.c:535
+#: g10/keyedit.c:1033 g10/keyedit.c:6161 g10/keyedit.c:6244 g10/keyedit.c:6373
+#: g10/keyedit.c:6435 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗: %s\n"
 
-#: g10/keyedit.c:1119
+#: g10/keyedit.c:1120
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr "金鑰祇剩下殘骸或者祇�有�上金鑰項目 - 沒有�變更的密語.\n"
 
-#: g10/keyedit.c:1151
+#: g10/keyedit.c:1152
 #, c-format
 msgid "key %s: error changing passphrase: %s\n"
 msgstr "金鑰 %s: 變更密語時出錯: %s\n"
 
-#: g10/keyedit.c:1265
+#: g10/keyedit.c:1266
 msgid "save and quit"
 msgstr "儲存並離開"
 
-#: g10/keyedit.c:1268
+#: g10/keyedit.c:1269
 msgid "show key fingerprint"
 msgstr "顯示金鑰指紋"
 
-#: g10/keyedit.c:1269
+#: g10/keyedit.c:1270
 #, fuzzy
 #| msgid "Enter the keygrip: "
 msgid "show the keygrip"
 msgstr "請輸入金鑰鑰柄: "
 
-#: g10/keyedit.c:1270
+#: g10/keyedit.c:1271
 msgid "list key and user IDs"
 msgstr "列出金鑰和使用者 ID"
 
-#: g10/keyedit.c:1272
+#: g10/keyedit.c:1273
 msgid "select user ID N"
 msgstr "�擇使用者 ID N"
 
-#: g10/keyedit.c:1273
+#: g10/keyedit.c:1274
 msgid "select subkey N"
 msgstr "�擇�鑰 N"
 
-#: g10/keyedit.c:1274
+#: g10/keyedit.c:1275
 msgid "check signatures"
 msgstr "檢查簽章"
 
-#: g10/keyedit.c:1280
+#: g10/keyedit.c:1281
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "簽署所�的使用者 ID [* 請�見底下相關的註解]"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1286
 msgid "sign selected user IDs locally"
 msgstr "僅在本機簽署所�的使用者 ID"
 
-#: g10/keyedit.c:1286
+#: g10/keyedit.c:1287
 msgid "sign selected user IDs with a trust signature"
 msgstr "用信任簽章來簽署所�的使用者 ID"
 
-#: g10/keyedit.c:1288
+#: g10/keyedit.c:1289
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "用��撤銷的簽章來簽署所�的使用者 ID"
 
-#: g10/keyedit.c:1290
+#: g10/keyedit.c:1291
 msgid "add a user ID"
 msgstr "增加使用者 ID"
 
-#: g10/keyedit.c:1292
+#: g10/keyedit.c:1293
 msgid "add a photo ID"
 msgstr "增加照片 ID"
 
-#: g10/keyedit.c:1293
+#: g10/keyedit.c:1294
 msgid "delete selected user IDs"
 msgstr "刪除所�的使用者 ID"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1297
 msgid "add a subkey"
 msgstr "增加�鑰"
 
-#: g10/keyedit.c:1299
+#: g10/keyedit.c:1300
 msgid "add a key to a smartcard"
 msgstr "將金鑰加到智慧�"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1302
 msgid "move a key to a smartcard"
 msgstr "將金鑰移動到智慧�"
 
-#: g10/keyedit.c:1303
+#: g10/keyedit.c:1304
 msgid "convert a key to TPM form using the local TPM"
 msgstr ""
 
-#: g10/keyedit.c:1305
+#: g10/keyedit.c:1306
 msgid "move a backup key to a smartcard"
 msgstr "將備份金鑰移動到智慧�"
 
-#: g10/keyedit.c:1307
+#: g10/keyedit.c:1308
 msgid "delete selected subkeys"
 msgstr "刪除所�的�鑰"
 
-#: g10/keyedit.c:1309
+#: g10/keyedit.c:1310
 msgid "add a revocation key"
 msgstr "增加撤銷金鑰"
 
-#: g10/keyedit.c:1311
+#: g10/keyedit.c:1312
 msgid "delete signatures from the selected user IDs"
 msgstr "從所�的使用者 ID 中刪除簽章"
 
-#: g10/keyedit.c:1313
+#: g10/keyedit.c:1314
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "變更金鑰或所��鑰的使用期�"
 
-#: g10/keyedit.c:1315
+#: g10/keyedit.c:1316
 msgid "flag the selected user ID as primary"
 msgstr "把所�的使用者 ID 標為主�"
 
-#: g10/keyedit.c:1318
+#: g10/keyedit.c:1319
 msgid "list preferences (expert)"
 msgstr "列出�好 (專家模�)"
 
-#: g10/keyedit.c:1319
+#: g10/keyedit.c:1320
 msgid "list preferences (verbose)"
 msgstr "列出�好 (囉唆模�)"
 
-#: g10/keyedit.c:1321
+#: g10/keyedit.c:1322
 msgid "set preference list for the selected user IDs"
 msgstr "設定所�使用者 ID 的�好清單"
 
-#: g10/keyedit.c:1324
+#: g10/keyedit.c:1325
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "為所�的使用者 ID 設定�好的金鑰伺�器 URL"
 
-#: g10/keyedit.c:1326
+#: g10/keyedit.c:1327
 msgid "set a notation for the selected user IDs"
 msgstr "為所�的使用者 ID 設定註記"
 
-#: g10/keyedit.c:1328
+#: g10/keyedit.c:1329
 msgid "change the passphrase"
 msgstr "更改密語"
 
-#: g10/keyedit.c:1331
+#: g10/keyedit.c:1332
 msgid "change the ownertrust"
 msgstr "更改主觀信任"
 
-#: g10/keyedit.c:1334
+#: g10/keyedit.c:1335
 msgid "revoke signatures on the selected user IDs"
 msgstr "撤銷所�使用者 ID 的簽章"
 
-#: g10/keyedit.c:1336
+#: g10/keyedit.c:1337
 msgid "revoke selected user IDs"
 msgstr "撤銷所�的使用者 ID"
 
-#: g10/keyedit.c:1339
+#: g10/keyedit.c:1340
 msgid "revoke key or selected subkeys"
 msgstr "撤銷金鑰或所�的�鑰"
 
-#: g10/keyedit.c:1341
+#: g10/keyedit.c:1342
 msgid "enable key"
 msgstr "啟用金鑰"
 
-#: g10/keyedit.c:1342
+#: g10/keyedit.c:1343
 msgid "disable key"
 msgstr "�用金鑰"
 
-#: g10/keyedit.c:1344
+#: g10/keyedit.c:1345
 msgid "show selected photo IDs"
 msgstr "顯示所�的照片 ID"
 
-#: g10/keyedit.c:1346
+#: g10/keyedit.c:1347
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "從金鑰中精簡無法使用的使用者 ID 並移除無法使用的簽章"
 
-#: g10/keyedit.c:1348
+#: g10/keyedit.c:1349
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "從金鑰中精簡無法使用的使用者 ID 並移除所有的簽章"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1470
 msgid "Secret key is available.\n"
 msgstr "�鑰�用.\n"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1472
 #, fuzzy
 #| msgid "Secret key is available.\n"
 msgid "Secret subkeys are available.\n"
 msgstr "�鑰�用.\n"
 
-#: g10/keyedit.c:1573
+#: g10/keyedit.c:1574
 msgid "Need the secret key to do this.\n"
 msgstr "�有�鑰纔能這麼�.\n"
 
-#: g10/keyedit.c:1596
+#: g10/keyedit.c:1597
 msgid ""
 "* The 'sign' command may be prefixed with an 'l' for local signatures "
 "(lsign),\n"
@@ -4573,295 +4580,279 @@ msgstr ""
 "  加上 't' 的話就是信任簽章 (tsign), 加上 'nr' 的話就是��撤銷簽章\n"
 "  (nrsign), 當然也�以任�組�這些�項 (�是 ltsign, tnrsign 等等.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2762 g10/keyedit.c:3135 g10/keyedit.c:3203
+#: g10/keyedit.c:1655 g10/keyedit.c:2802 g10/keyedit.c:3175 g10/keyedit.c:3243
 msgid "Key is revoked."
 msgstr "金鑰已撤銷."
 
-#: g10/keyedit.c:1677
+#: g10/keyedit.c:1678
 #, 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:1682
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的�簽署所有的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1689
+#: g10/keyedit.c:1690
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "�示: �擇使用者 ID 來加以簽署\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1701
 #, 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:1747 g10/keyedit.c:1771 g10/keyedit.c:2009
 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:1749 g10/keyedit.c:1773 g10/keyedit.c:1971 g10/keyedit.c:2011
 #, c-format
 msgid "(Use the '%s' command.)\n"
 msgstr ""
 
-#: g10/keyedit.c:1751
+#: g10/keyedit.c:1752
 msgid "You can't delete the last user ID!\n"
 msgstr "你�能刪除最後一個使用者 ID!\n"
 
-#: g10/keyedit.c:1754
+#: g10/keyedit.c:1755
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的�移除所有被�擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1755
+#: g10/keyedit.c:1756
 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:1814 g10/keyedit.c:1854
 msgid "Really move the primary key? (y/N) "
 msgstr "真的�移動主鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4908
+#: g10/keyedit.c:1826 g10/keyedit.c:1866 g10/keyedit.c:4800
 msgid "You must select exactly one key.\n"
 msgstr "你一定祇得�擇一把金鑰.\n"
 
-#: g10/keyedit.c:1893
+#: g10/keyedit.c:1894
 msgid "Command expects a filename argument\n"
 msgstr "這項指令�拿一個檔�來當作引數\n"
 
-#: g10/keyedit.c:1914
+#: g10/keyedit.c:1915
 #, c-format
 msgid "Can't open '%s': %s\n"
 msgstr "無法開啟 '%s': %s\n"
 
-#: g10/keyedit.c:1933
+#: g10/keyedit.c:1934
 #, c-format
 msgid "Error reading backup key from '%s': %s\n"
 msgstr "從 '%s' 讀�備份金鑰時出錯: %s\n"
 
-#: g10/keyedit.c:1968
+#: g10/keyedit.c:1969
 msgid "You must select at least one key.\n"
 msgstr "你至少得�擇一把金鑰.\n"
 
-#: g10/keyedit.c:1974
+#: g10/keyedit.c:1975
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "你真的想�刪除所�的金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1976
+#: g10/keyedit.c:1977
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "你真的想�刪除這把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2015
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的�撤銷所有所�的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2015
+#: g10/keyedit.c:2016
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的�撤銷這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2033
+#: g10/keyedit.c:2034
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "你真的想�撤銷這整把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2044
+#: g10/keyedit.c:2045
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "你真的想�撤銷所�的�鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:2047
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "你真的想�撤銷這把�鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2104
+#: g10/keyedit.c:2105
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr "使用使用者所�供的信任資料庫時�能無法設定主觀信任\n"
 
-#: g10/keyedit.c:2149
+#: g10/keyedit.c:2150
 msgid "Set preference list to:\n"
 msgstr "設定�好清單至:\n"
 
-#: g10/keyedit.c:2156
+#: g10/keyedit.c:2157
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的�更新所�使用者 ID 的�好設定嗎? (y/N) "
 
-#: g10/keyedit.c:2158
+#: g10/keyedit.c:2159
 msgid "Really update the preferences? (y/N) "
 msgstr "真的�更新�好設定嗎? (y/N) "
 
-#: g10/keyedit.c:2232
+#: g10/keyedit.c:2233
 msgid "Save changes? (y/N) "
 msgstr "�儲存變更嗎? (y/N) "
 
-#: g10/keyedit.c:2236
+#: g10/keyedit.c:2237
 msgid "Quit without saving? (y/N) "
 msgstr "��儲存就離開嗎? (y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2857 g10/keyedit.c:3156 g10/keyedit.c:3308
+#: g10/keyedit.c:2264 g10/keyedit.c:2897 g10/keyedit.c:3196 g10/keyedit.c:3348
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以�需�更新.\n"
 
-#: g10/keyedit.c:2557
+#: g10/keyedit.c:2558
 #, 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:2583
+#: g10/keyedit.c:2584
 #, 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:2646
+#: g10/keyedit.c:2647
 #, 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:2677
+#: g10/keyedit.c:2717
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" �是指紋\n"
 
-#: g10/keyedit.c:2697
+#: g10/keyedit.c:2737
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" �是主�指紋\n"
 
-#: g10/keyedit.c:2833 g10/keyedit.c:2836
+#: g10/keyedit.c:2873 g10/keyedit.c:2876
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "無效的數值\n"
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "No matching user IDs."
 msgstr "沒有相符的使用者 ID."
 
-#: g10/keyedit.c:2839
+#: g10/keyedit.c:2879
 msgid "Nothing to sign.\n"
 msgstr "沒有�西�以簽署.\n"
 
-#: g10/keyedit.c:3032 g10/keyedit.c:6132
+#: g10/keyedit.c:3072 g10/keyedit.c:6026
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "並�由你所簽署.\n"
 
-#: g10/keyedit.c:3090
+#: g10/keyedit.c:3130
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "檢查已建立的簽章時出錯: %s\n"
 
-#: g10/keyedit.c:3211
+#: g10/keyedit.c:3251
 #, 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:3253
+#: g10/keyedit.c:3293
 #, fuzzy, c-format
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" �是指紋\n"
 
-#: g10/keyedit.c:3277
+#: g10/keyedit.c:3317
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "找�到金鑰 \"%s\": %s\n"
 
-#: g10/keyedit.c:3400
-msgid "AEAD: "
-msgstr ""
-
-#: g10/keyedit.c:3417
-msgid "Digest: "
-msgstr "摘�: "
-
-#: g10/keyedit.c:3474
-msgid "Features: "
-msgstr "特點: "
-
-#: g10/keyedit.c:3491
-msgid "Keyserver no-modify"
-msgstr "金鑰伺�器無修改"
-
-#: g10/keyedit.c:3506 g10/keylist.c:392
+#: g10/keyedit.c:3413 g10/keylist.c:614
 msgid "Preferred keyserver: "
 msgstr "�好的金鑰伺�器: "
 
-#: g10/keyedit.c:3514 g10/keyedit.c:3515
+#: g10/keyedit.c:3421 g10/keyedit.c:3422
 msgid "Notations: "
 msgstr "註記: "
 
-#: g10/keyedit.c:3771
+#: g10/keyedit.c:3663
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 型態的使用者 ID 沒有�好設定.\n"
 
-#: g10/keyedit.c:3843
+#: g10/keyedit.c:3735
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "下列金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
 
-#: g10/keyedit.c:3867
+#: g10/keyedit.c:3759
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "這把金鑰�能被 %s 金鑰 %s 所撤銷"
 
-#: g10/keyedit.c:3873
+#: g10/keyedit.c:3765
 msgid "(sensitive)"
 msgstr "(機密)"
 
-#: g10/keyedit.c:3915 g10/keyedit.c:4062 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3807 g10/keyedit.c:3954 g10/keylist.c:338 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "建立: %s"
 
-#: g10/keyedit.c:3918 g10/keylist.c:2261
+#: g10/keyedit.c:3810 g10/keylist.c:2507
 #, c-format
 msgid "revoked: %s"
 msgstr "撤銷: %s"
 
 #  of subkey
-#: g10/keyedit.c:3920 g10/keylist.c:2267
+#: g10/keyedit.c:3812 g10/keylist.c:2513
 #, c-format
 msgid "expired: %s"
 msgstr "�期: %s"
 
 #  of subkey
-#: g10/keyedit.c:3922 g10/keyedit.c:4064 g10/keylist.c:285 g10/keylist.c:2273
+#: g10/keyedit.c:3814 g10/keyedit.c:3956 g10/keylist.c:340 g10/keylist.c:2519
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "到期: %s"
 
-#: g10/keyedit.c:3924
+#: g10/keyedit.c:3816
 #, c-format
 msgid "usage: %s"
 msgstr "用途: %s"
 
-#: g10/keyedit.c:3932 g10/keyedit.c:3952 g10/keylist.c:288
+#: g10/keyedit.c:3824 g10/keyedit.c:3844 g10/keylist.c:343
 msgid "card-no: "
 msgstr "�片編號: "
 
-#: g10/keyedit.c:3991
+#: g10/keyedit.c:3883
 #, c-format
 msgid "trust: %s"
 msgstr "ä¿¡ä»»: %s"
 
-#: g10/keyedit.c:3995
+#: g10/keyedit.c:3887
 #, c-format
 msgid "validity: %s"
 msgstr "有效性: %s"
 
-#: g10/keyedit.c:4002
+#: g10/keyedit.c:3894
 msgid "This key has been disabled"
 msgstr "這把金鑰已經�用了"
 
-#: g10/keyedit.c:4020
+#: g10/keyedit.c:3912
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4869,17 +4860,17 @@ msgstr ""
 "請注�顯示出來的金鑰有效性�需�更正,\n"
 "除�你�新執行程�.\n"
 
-#: g10/keyedit.c:4082 g10/keyedit.c:4513 g10/keyserver.c:358
-#: g10/mainproc.c:2373 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:849
+#: g10/keyedit.c:3974 g10/keyedit.c:4405 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:4084 g10/keyedit.c:4515 g10/keyserver.c:362
+#: g10/keyedit.c:3976 g10/keyedit.c:4407 g10/keyserver.c:362
 #: g10/mainproc.c:2375 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "已�期"
 
-#: g10/keyedit.c:4201
+#: g10/keyedit.c:4093
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4888,17 +4879,17 @@ msgstr ""
 "警告: 沒有任何使用者 ID 被標示為主� ID. 這項指令�能會\n"
 "      導致��的使用者 ID 被當�主� ID.\n"
 
-#: g10/keyedit.c:4253
+#: g10/keyedit.c:4145
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "警告: 你的加密�鑰很快將到期.\n"
 
-#: g10/keyedit.c:4254
+#: g10/keyedit.c:4146
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "你�能也會想變更其使用期�.\n"
 
-#: g10/keyedit.c:4313
+#: g10/keyedit.c:4205
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4907,74 +4898,74 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID �能會導致�些版本的 PGP �回這把金鑰.\n"
 
-#: g10/keyedit.c:4318 g10/keyedit.c:4608
+#: g10/keyedit.c:4210 g10/keyedit.c:4500
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "你確定�然想�增加嗎? (y/N) "
 
-#: g10/keyedit.c:4324
+#: g10/keyedit.c:4216
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "你��以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:4339
+#: g10/keyedit.c:4231
 #, 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:4441
+#: g10/keyedit.c:4333
 msgid "Delete this good signature? (y/N/q)"
 msgstr "刪除這份完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4343
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "刪除這份無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:4455
+#: g10/keyedit.c:4347
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "刪除這份未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:4462
+#: g10/keyedit.c:4354
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的�刪除這份自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:4478
+#: g10/keyedit.c:4370
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "已經刪除了 %d 份簽章.\n"
 
-#: g10/keyedit.c:4482
+#: g10/keyedit.c:4374
 msgid "Nothing deleted.\n"
 msgstr "沒有刪除任何�西.\n"
 
-#: g10/keyedit.c:4517
+#: g10/keyedit.c:4409
 msgid "invalid"
 msgstr "無效"
 
-#: g10/keyedit.c:4519
+#: g10/keyedit.c:4411
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "使用者 ID \"%s\" 已精簡: %s\n"
 
-#: g10/keyedit.c:4525
+#: g10/keyedit.c:4417
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
 msgstr[0] "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 
-#: g10/keyedit.c:4533
+#: g10/keyedit.c:4425
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "使用者 ID \"%s\": 已經最�化了\n"
 
-#: g10/keyedit.c:4534
+#: g10/keyedit.c:4426
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
 
-#: g10/keyedit.c:4603
+#: g10/keyedit.c:4495
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4983,15 +4974,15 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加指定撤銷者�能會導致�些版本的 PGP �回這把金鑰.\n"
 
-#: g10/keyedit.c:4614
+#: g10/keyedit.c:4506
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "你��以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:4631
+#: g10/keyedit.c:4523
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:4657
+#: g10/keyedit.c:4549
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
@@ -4999,26 +4990,26 @@ msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:4673
+#: g10/keyedit.c:4565
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "你�能指派�把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:4695
+#: g10/keyedit.c:4587
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "已指定這把金鑰為撤銷者了\n"
 
-#: g10/keyedit.c:4713
+#: g10/keyedit.c:4605
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把�把金鑰指派為指定撤銷者後, 就無法�悔了!\n"
 
-#: g10/keyedit.c:4719
+#: g10/keyedit.c:4611
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "你確定�指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:4788
+#: g10/keyedit.c:4680
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5027,177 +5018,177 @@ msgid ""
 "N) "
 msgstr "你確定�指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:4793
+#: g10/keyedit.c:4685
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更�鑰的使用期�.\n"
 
-#: g10/keyedit.c:4796
+#: g10/keyedit.c:4688
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期�.\n"
 
-#: g10/keyedit.c:4852
+#: g10/keyedit.c:4744
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "你�能變更 v3 金鑰的使用期�\n"
 
-#: g10/keyedit.c:4912
+#: g10/keyedit.c:4804
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "正在變更�鑰的使用期�.\n"
 
-#: g10/keyedit.c:4915
+#: g10/keyedit.c:4807
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "正在變更主鑰的使用期�.\n"
 
-#: g10/keyedit.c:5033
+#: g10/keyedit.c:4925
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "簽署�鑰 %s 已經交��證�了\n"
 
-#: g10/keyedit.c:5039
+#: g10/keyedit.c:4931
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "�鑰 %s ��簽署之用, 因此無須交�驗證\n"
 
-#: g10/keyedit.c:5156
+#: g10/keyedit.c:5048
 msgid "Please select exactly one user ID.\n"
 msgstr "請祇�擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:5197 g10/keyedit.c:5311 g10/keyedit.c:5427 g10/keyedit.c:5570
+#: g10/keyedit.c:5089 g10/keyedit.c:5205 g10/keyedit.c:5321 g10/keyedit.c:5464
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳�使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:5368
+#: g10/keyedit.c:5262
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入你的�好金鑰伺�器 URL: "
 
-#: g10/keyedit.c:5450
+#: g10/keyedit.c:5344
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "你確定��代它嗎？ (y/N) "
 
-#: g10/keyedit.c:5451
+#: g10/keyedit.c:5345
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "你確定�刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:5516
+#: g10/keyedit.c:5410
 msgid "Enter the notation: "
 msgstr "請輸入註記: "
 
-#: g10/keyedit.c:5663
+#: g10/keyedit.c:5557
 msgid "Proceed? (y/N) "
 msgstr "是�繼續? (y/N) "
 
-#: g10/keyedit.c:5733
+#: g10/keyedit.c:5627
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有�應到使用者 ID\n"
 
-#: g10/keyedit.c:5795
+#: g10/keyedit.c:5689
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有�應到使用者 ID\n"
 
-#: g10/keyedit.c:5896
+#: g10/keyedit.c:5790
 #, fuzzy, c-format
 #| msgid "No subkey with index %d\n"
 msgid "No subkey with key ID '%s'.\n"
 msgstr "索引 %d 沒有�應到�鑰\n"
 
-#: g10/keyedit.c:5918
+#: g10/keyedit.c:5812
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有�應到�鑰\n"
 
-#: g10/keyedit.c:6059
+#: g10/keyedit.c:5953
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:6062 g10/keyedit.c:6164 g10/keyedit.c:6212
+#: g10/keyedit.c:5956 g10/keyedit.c:6058 g10/keyedit.c:6106
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
 
-#: g10/keyedit.c:6064 g10/keyedit.c:6166 g10/keyedit.c:6214
+#: g10/keyedit.c:5958 g10/keyedit.c:6060 g10/keyedit.c:6108
 msgid " (non-exportable)"
 msgstr " (��匯出)"
 
-#: g10/keyedit.c:6068
+#: g10/keyedit.c:5962
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽章已經在 %s �期了.\n"
 
-#: g10/keyedit.c:6073
+#: g10/keyedit.c:5967
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "你確定�然想�撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:6078
+#: g10/keyedit.c:5972
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:6138
+#: g10/keyedit.c:6032
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:6167
+#: g10/keyedit.c:6061
 msgid " (non-revocable)"
 msgstr " (��撤銷)"
 
-#: g10/keyedit.c:6174
+#: g10/keyedit.c:6068
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:6199
+#: g10/keyedit.c:6093
 msgid "You are about to revoke these signatures:\n"
 msgstr "你正�撤銷這些簽章:\n"
 
-#: g10/keyedit.c:6222
+#: g10/keyedit.c:6116
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的�建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:6255
+#: g10/keyedit.c:6149
 #, c-format
 msgid "no secret key\n"
 msgstr "沒有�鑰\n"
 
-#: g10/keyedit.c:6303
+#: g10/keyedit.c:6197
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6313
+#: g10/keyedit.c:6207
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已撤銷\n"
 
-#: g10/keyedit.c:6330
+#: g10/keyedit.c:6224
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:6426
+#: g10/keyedit.c:6320
 #, 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:6464
+#: g10/keyedit.c:6358
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:6526
+#: g10/keyedit.c:6420
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:6623
+#: g10/keyedit.c:6517
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
@@ -5239,51 +5230,51 @@ msgstr "編密�好�多\n"
 msgid "invalid item '%s' in preference string\n"
 msgstr "�好字串中�有無效的項目 '%s'\n"
 
-#: g10/keygen.c:1141
+#: g10/keygen.c:1118
 #, c-format
 msgid "writing direct signature\n"
 msgstr "寫入直接簽章中\n"
 
-#: g10/keygen.c:1187
+#: g10/keygen.c:1164
 #, c-format
 msgid "writing self signature\n"
 msgstr "寫入自我簽章中\n"
 
-#: g10/keygen.c:1244
+#: g10/keygen.c:1221
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "寫入附鑰簽章中\n"
 
-#: g10/keygen.c:1609 g10/keygen.c:1614 g10/keygen.c:1666 g10/keygen.c:1671
-#: g10/keygen.c:1843 g10/keygen.c:1848
+#: g10/keygen.c:1586 g10/keygen.c:1591 g10/keygen.c:1643 g10/keygen.c:1648
+#: g10/keygen.c:1820 g10/keygen.c:1825
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "金鑰尺寸無效; 改用 %u �元\n"
 
-#: g10/keygen.c:1620 g10/keygen.c:1677 g10/keygen.c:1685 g10/keygen.c:1854
+#: g10/keygen.c:1597 g10/keygen.c:1654 g10/keygen.c:1662 g10/keygen.c:1831
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u �元\n"
 
-#: g10/keygen.c:1711
+#: g10/keygen.c:1688
 #, 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:1910
+#: g10/keygen.c:1887
 msgid "Sign"
 msgstr "簽署"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1890
 msgid "Certify"
 msgstr "�證"
 
-#: g10/keygen.c:1916
+#: g10/keygen.c:1893
 msgid "Encrypt"
 msgstr "加密"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1896
 msgid "Authenticate"
 msgstr "鑑定"
 
@@ -5297,180 +5288,180 @@ msgstr "鑑定"
 #. *   a = Toggle authentication capability
 #. *   q = Finish
 #.
-#: g10/keygen.c:1940
+#: g10/keygen.c:1917
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1977
+#: g10/keygen.c:1954
 #, fuzzy, c-format
 #| msgid "Possible actions for a %s key: "
 msgid "Possible actions for this %s key: "
 msgstr "%s 金鑰�能的動作: "
 
-#: g10/keygen.c:1984
+#: g10/keygen.c:1961
 msgid "Current allowed actions: "
 msgstr "目��進行的動作: "
 
-#: g10/keygen.c:1989
+#: g10/keygen.c:1966
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 切�簽署性能\n"
 
-#: g10/keygen.c:1992
+#: g10/keygen.c:1969
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 切�加密性能\n"
 
-#: g10/keygen.c:1995
+#: g10/keygen.c:1972
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 切�鑑定性能\n"
 
-#: g10/keygen.c:1998
+#: g10/keygen.c:1975
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完�\n"
 
-#: g10/keygen.c:2127
+#: g10/keygen.c:2104
 #, 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:2131
+#: g10/keygen.c:2108
 #, fuzzy, c-format
 #| msgid "   (%d) DSA and Elgamal\n"
 msgid "   (%d) DSA and Elgamal%s\n"
 msgstr "   (%d) DSA 和 Elgamal\n"
 
-#: g10/keygen.c:2134
+#: g10/keygen.c:2111
 #, fuzzy, c-format
 #| msgid "   (%d) DSA (sign only)\n"
 msgid "   (%d) DSA (sign only)%s\n"
 msgstr "   (%d) DSA (僅能用於簽署)\n"
 
-#: g10/keygen.c:2136
+#: g10/keygen.c:2113
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (sign only)\n"
 msgid "   (%d) RSA (sign only)%s\n"
 msgstr "   (%d) RSA (僅能用於簽署)\n"
 
-#: g10/keygen.c:2142
+#: g10/keygen.c:2119
 #, fuzzy, c-format
 #| msgid "   (%d) Elgamal (encrypt only)\n"
 msgid "   (%d) Elgamal (encrypt only)%s\n"
 msgstr "   (%d) Elgamal (僅能用於加密)\n"
 
-#: g10/keygen.c:2144
+#: g10/keygen.c:2121
 #, fuzzy, c-format
 #| msgid "   (%d) RSA (encrypt only)\n"
 msgid "   (%d) RSA (encrypt only)%s\n"
 msgstr "   (%d) RSA (僅能用於加密)\n"
 
-#: g10/keygen.c:2150
+#: g10/keygen.c:2127
 #, 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:2152
+#: g10/keygen.c:2129
 #, 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:2158
+#: g10/keygen.c:2135
 #, fuzzy, c-format
 #| msgid "   (%d) sign, encrypt\n"
 msgid "   (%d) ECC (sign and encrypt)%s\n"
 msgstr "   (%d) 簽署, 加密\n"
 
-#: g10/keygen.c:2158 g10/keygen.c:2689
+#: g10/keygen.c:2135 g10/keygen.c:2666
 msgid " *default*"
 msgstr ""
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2136
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "   (%d) ECC (僅能用於簽署)\n"
 
-#: g10/keygen.c:2161
+#: g10/keygen.c:2138
 #, 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:2163
+#: g10/keygen.c:2140
 #, fuzzy, c-format
 #| msgid "  (%d) ECC (encrypt only)\n"
 msgid "  (%d) ECC (encrypt only)%s\n"
 msgstr "   (%d) ECC (僅能用於加密)\n"
 
-#: g10/keygen.c:2167
+#: g10/keygen.c:2144
 #, fuzzy, c-format
 #| msgid "  (%d) Existing key\n"
 msgid "  (%d) Existing key%s\n"
 msgstr "   (%d) �有的金鑰\n"
 
-#: g10/keygen.c:2169
+#: g10/keygen.c:2146
 #, fuzzy, c-format
 #| msgid "   (%d) Existing key from card\n"
 msgid "  (%d) Existing key from card%s\n"
 msgstr "   (%d) �片上�存的金鑰\n"
 
-#: g10/keygen.c:2265 sm/certreqgen-ui.c:203
+#: g10/keygen.c:2242 sm/certreqgen-ui.c:203
 msgid "Enter the keygrip: "
 msgstr "請輸入金鑰鑰柄: "
 
-#: g10/keygen.c:2278 sm/certreqgen-ui.c:211 tools/gpg-card.c:2311
+#: g10/keygen.c:2255 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:2280 sm/certreqgen-ui.c:213
+#: g10/keygen.c:2257 sm/certreqgen-ui.c:213
 msgid "No key with this keygrip\n"
 msgstr "沒有金鑰有此金鑰鑰柄\n"
 
-#: g10/keygen.c:2299 g10/keygen.c:2309 g10/keygen.c:3447 g10/keygen.c:3458
+#: g10/keygen.c:2276 g10/keygen.c:2286 g10/keygen.c:3421 g10/keygen.c:3432
 #: 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:2303 g10/keygen.c:3451 sm/certreqgen-ui.c:234
+#: g10/keygen.c:2280 g10/keygen.c:3425 sm/certreqgen-ui.c:234
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "�片�號: %s\n"
 
-#: g10/keygen.c:2322 sm/certreqgen-ui.c:246
+#: g10/keygen.c:2299 sm/certreqgen-ui.c:246
 msgid "Available keys:\n"
 msgstr "�用金鑰:\n"
 
-#: g10/keygen.c:2515 g10/keygen.c:2529
+#: g10/keygen.c:2492 g10/keygen.c:2506
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "加大到 %u �元\n"
 
-#: g10/keygen.c:2570
+#: g10/keygen.c:2547
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 金鑰的長度�能介於 %u �元和 %u �元之間.\n"
 
-#: g10/keygen.c:2578
+#: g10/keygen.c:2555
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "你的�鑰想�用多大的金鑰尺寸? (%u) "
 
-#: g10/keygen.c:2595 sm/certreqgen-ui.c:190
+#: g10/keygen.c:2572 sm/certreqgen-ui.c:190
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "你所�求的金鑰尺寸是 %u �元\n"
 
-#: g10/keygen.c:2641
+#: g10/keygen.c:2618
 msgid "Please select which elliptic curve you want:\n"
 msgstr "請�擇你�使用的橢圓曲線:\n"
 
-#: g10/keygen.c:2830
+#: g10/keygen.c:2807
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -5486,7 +5477,7 @@ msgstr ""
 "      <n>m = 金鑰在 n 月後會到期\n"
 "      <n>y = 金鑰在 n 年後會到期\n"
 
-#: g10/keygen.c:2841
+#: g10/keygen.c:2818
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -5502,38 +5493,38 @@ msgstr ""
 "      <n>m = 簽章在 n 月後會到期\n"
 "      <n>y = 簽章在 n 年後會到期\n"
 
-#: g10/keygen.c:2864
+#: g10/keygen.c:2841
 msgid "Key is valid for? (0) "
 msgstr "金鑰的有效期�是多久? (0) "
 
-#: g10/keygen.c:2869
+#: g10/keygen.c:2846
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "簽章的有效期�是多久? (%s) "
 
-#: g10/keygen.c:2885 g10/keygen.c:2910
+#: g10/keygen.c:2862 g10/keygen.c:2887
 msgid "invalid value\n"
 msgstr "無效的數值\n"
 
-#: g10/keygen.c:2892
+#: g10/keygen.c:2869
 msgid "Key does not expire at all\n"
 msgstr "金鑰完全�會�期\n"
 
-#: g10/keygen.c:2893
+#: g10/keygen.c:2870
 msgid "Signature does not expire at all\n"
 msgstr "簽章完全�會�期\n"
 
-#: g10/keygen.c:2898
+#: g10/keygen.c:2875
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "金鑰將會在 %s 到期\n"
 
-#: g10/keygen.c:2899
+#: g10/keygen.c:2876
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "簽章將會在 %s 到期.\n"
 
-#: g10/keygen.c:2903
+#: g10/keygen.c:2880
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -5541,11 +5532,11 @@ msgstr ""
 "你的系統無法顯示 2038 年以後的日期.\n"
 "��, 它�以正確處�直到 2106 年之�的年份.\n"
 
-#: g10/keygen.c:2916
+#: g10/keygen.c:2893
 msgid "Is this correct? (y/N) "
 msgstr "以上正確嗎? (y/N) "
 
-#: g10/keygen.c:2984
+#: g10/keygen.c:2961
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -5559,7 +5550,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2999
+#: g10/keygen.c:2976
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -5574,41 +5565,41 @@ msgstr ""
 "    \"Ke-Huan Lin (Jedi) <Jedi@Jedi.org>\"\n"
 "\n"
 
-#: g10/keygen.c:3018
+#: g10/keygen.c:2995
 msgid "Real name: "
 msgstr "真實姓�: "
 
-#: g10/keygen.c:3027
+#: g10/keygen.c:3004
 msgid "Invalid character in name\n"
 msgstr "姓��有無效的字符\n"
 
-#: g10/keygen.c:3028
+#: g10/keygen.c:3005
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr ""
 
-#: g10/keygen.c:3038
+#: g10/keygen.c:3015
 msgid "Email address: "
 msgstr "電�郵件地�: "
 
-#: g10/keygen.c:3044
+#: g10/keygen.c:3021
 msgid "Not a valid email address\n"
 msgstr "�是有效的電�郵件地�\n"
 
-#: g10/keygen.c:3053
+#: g10/keygen.c:3030
 msgid "Comment: "
 msgstr "註釋: "
 
-#: g10/keygen.c:3059
+#: g10/keygen.c:3036
 msgid "Invalid character in comment\n"
 msgstr "註釋�有無效的字符\n"
 
-#: g10/keygen.c:3095
+#: g10/keygen.c:3072
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "你正在使用 '%s' 字元集.\n"
 
-#: g10/keygen.c:3101
+#: g10/keygen.c:3078
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5619,11 +5610,11 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3106
+#: g10/keygen.c:3083
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "請��把電�郵件地�放進你的真實姓�或註釋裡\n"
 
-#: g10/keygen.c:3114
+#: g10/keygen.c:3091
 msgid "Such a user ID already exists on this key!\n"
 msgstr "這把金鑰上已經有這樣�的使用者 ID 了!\n"
 
@@ -5638,31 +5629,31 @@ msgstr "這把金鑰上已經有這樣�的使用者 ID 了!\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:3131
+#: g10/keygen.c:3108
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:3141
+#: g10/keygen.c:3118
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "變更姓�(N), 註釋(C), 電�郵件地�(E)或退出(Q)? "
 
-#: g10/keygen.c:3142
+#: g10/keygen.c:3119
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "變更姓�(N), 註釋(C), 電�郵件地�(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:3147
+#: g10/keygen.c:3124
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "變更姓�(N), 電�郵件地�(E)或退出(Q)? "
 
-#: g10/keygen.c:3148
+#: g10/keygen.c:3125
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "變更姓�(N), 電�郵件地�(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:3167
+#: g10/keygen.c:3144
 msgid "Please correct the error first\n"
 msgstr "請先訂正錯誤\n"
 
-#: g10/keygen.c:3213
+#: g10/keygen.c:3190
 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"
@@ -5673,18 +5664,18 @@ msgstr ""
 "(�是敲打�盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 "這會讓隨機數字產生器有更多的機會�得夠多的亂數.\n"
 
-#: g10/keygen.c:3598
+#: g10/keygen.c:3572
 #, c-format
 msgid "WARNING: v4 is specified, but overridden by v5.\n"
 msgstr ""
 
-#: g10/keygen.c:4608 g10/keygen.c:4681 g10/keygen.c:4699 g10/keygen.c:4728
-#: g10/keygen.c:5127 g10/keygen.c:5673 g10/keygen.c:5990 g10/keygen.c:6100
+#: g10/keygen.c:4579 g10/keygen.c:4652 g10/keygen.c:4670 g10/keygen.c:4699
+#: g10/keygen.c:5098 g10/keygen.c:5644 g10/keygen.c:5961 g10/keygen.c:6071
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:4617
+#: g10/keygen.c:4588
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5695,64 +5686,64 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:4619
+#: g10/keygen.c:4590
 msgid "Continue? (Y/n) "
 msgstr "是�繼續? (Y/n) "
 
-#: g10/keygen.c:4640
+#: g10/keygen.c:4611
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "\"%s\" 的金鑰已存在\n"
 
-#: g10/keygen.c:4645
+#: g10/keygen.c:4616
 msgid "Create anyway? (y/N) "
 msgstr "無論如何還是�建立嗎? (y/N) "
 
-#: g10/keygen.c:4651
+#: g10/keygen.c:4622
 #, c-format
 msgid "creating anyway\n"
 msgstr "總之還是在建立\n"
 
-#: g10/keygen.c:5110
+#: g10/keygen.c:5081
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "請注�: 如需全能金鑰產生�話框請用  \"%s %s\".\n"
 
-#: g10/keygen.c:5159
+#: g10/keygen.c:5130
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "金鑰產生已�消.\n"
 
-#: g10/keygen.c:5219
+#: g10/keygen.c:5190
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "無法建立備份檔案 '%s': %s\n"
 
-#: g10/keygen.c:5239
+#: g10/keygen.c:5210
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "請注�: �片金鑰的備份已儲存至 '%s'\n"
 
-#: g10/keygen.c:5403 g10/keygen.c:5605
+#: g10/keygen.c:5374 g10/keygen.c:5576
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "正在寫入公鑰至 '%s'\n"
 
-#: g10/keygen.c:5599
+#: g10/keygen.c:5570
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找�到�寫入的公鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:5613
+#: g10/keygen.c:5584
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "寫入公鑰鑰匙圈 '%s' 時出錯: %s\n"
 
-#: g10/keygen.c:5644
+#: g10/keygen.c:5615
 msgid "public and secret key created and signed.\n"
 msgstr "公鑰和�鑰已建立�簽署.\n"
 
-#: g10/keygen.c:5660
+#: g10/keygen.c:5631
 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"
@@ -5760,34 +5751,34 @@ msgstr ""
 "請注�這把金鑰�能用於加密.  也許你會想藉由 \"--edit-key\" 指令\n"
 "來產生加密用的�鑰.\n"
 
-#: g10/keygen.c:5842 g10/keygen.c:6050
+#: g10/keygen.c:5813 g10/keygen.c:6021
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (�能是因為時光旅行或時�的�題)\n"
 
-#: g10/keygen.c:5844 g10/keygen.c:6052
+#: g10/keygen.c:5815 g10/keygen.c:6023
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (�能是因為時光旅行或時�的�題)\n"
 
-#: g10/keygen.c:5855 g10/keygen.c:6063
+#: g10/keygen.c:5826 g10/keygen.c:6034
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注�: � v3 金鑰製造�鑰�符� OpenPGP �範\n"
 
-#: g10/keygen.c:5867 g10/keygen.c:5869
+#: g10/keygen.c:5838 g10/keygen.c:5840
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的�鑰部分無法�用.\n"
 
-#: g10/keygen.c:5876 g10/keygen.c:5878
+#: g10/keygen.c:5847 g10/keygen.c:5849
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的�鑰部分存放於�上.\n"
 
-#: g10/keygen.c:5903 g10/keygen.c:6077
+#: g10/keygen.c:5874 g10/keygen.c:6048
 msgid "Really create? (y/N) "
 msgstr "真的�建立嗎? (y/N) "
 
@@ -5795,75 +5786,91 @@ msgstr "真的�建立嗎? (y/N) "
 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"
 msgstr[0] "%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"
 msgstr[0] "有 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"
 msgstr[0] "警告: %lu 把金鑰因尺寸太大已跳�\n"
 
-#: g10/keylist.c:617
+#: g10/keylist.c:839
 msgid "Keyring"
 msgstr "鑰匙圈"
 
-#: g10/keylist.c:2117
+#: g10/keylist.c:2363
 msgid "Primary key fingerprint:"
 msgstr "               主鑰指紋:"
 
-#: g10/keylist.c:2119
+#: g10/keylist.c:2365
 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:2127
+#: g10/keylist.c:2373
 msgid " Primary key fingerprint:"
 msgstr "                主鑰指紋:"
 
-#: g10/keylist.c:2129 g10/keylist.c:2139
+#: g10/keylist.c:2375 g10/keylist.c:2385
 msgid "      Subkey fingerprint:"
 msgstr "                �鑰指紋:"
 
 #  use tty
-#: g10/keylist.c:2134 g10/keylist.c:2150
+#: g10/keylist.c:2380 g10/keylist.c:2396
 msgid "      Key fingerprint ="
 msgstr "      金鑰指紋 ="
 
-#: g10/keylist.c:2201
+#: g10/keylist.c:2447
 msgid "      Card serial no. ="
 msgstr "      �片�號 ="
 
@@ -6235,7 +6242,7 @@ msgstr "二進制"
 msgid "textmode"
 msgstr "文字模�"
 
-#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:850
+#: g10/mainproc.c:2474 g10/trust.c:112 dirmngr/ocsp.c:890
 msgid "unknown"
 msgstr "未知"
 
@@ -6372,27 +6379,27 @@ msgstr "未壓縮"
 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:1614
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "�明確的�項 '%s'\n"
 
-#: g10/misc.c:1650
+#: g10/misc.c:1639
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "未知的�項 '%s'\n"
 
-#: g10/misc.c:1888
+#: g10/misc.c:1877
 #, 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:1899
 #, fuzzy, c-format
 #| msgid "Unknown signature type '%s'\n"
 msgid "unknown weak digest '%s'\n"
@@ -6512,7 +6519,7 @@ msgstr ""
 "建立於 %s%s.\n"
 "%s"
 
-#: g10/photoid.c:78
+#: g10/photoid.c:185
 msgid ""
 "\n"
 "Pick an image to use for your photo ID.  The image must be a JPEG file.\n"
@@ -6526,75 +6533,75 @@ msgstr ""
 "你的金鑰也會變��常地大!\n"
 "盡�把圖片尺寸控制在 240x288 左�, 會是個�常�想的大�.\n"
 
-#: g10/photoid.c:100
+#: g10/photoid.c:207
 msgid "Enter JPEG filename for photo ID: "
 msgstr "輸入�當作照片 ID 的 JPEG 檔�: "
 
-#: g10/photoid.c:121
+#: g10/photoid.c:228
 #, c-format
 msgid "unable to open JPEG file '%s': %s\n"
 msgstr "無法開啟 JPEG 圖檔 '%s': %s\n"
 
-#: g10/photoid.c:132
+#: g10/photoid.c:239
 #, c-format
 msgid "This JPEG is really large (%d bytes) !\n"
 msgstr "這個 JPEG 檔案真的很大 (%d �元組) !\n"
 
-#: g10/photoid.c:134
+#: g10/photoid.c:241
 msgid "Are you sure you want to use it? (y/N) "
 msgstr "你確定�用它嗎? (y/N) "
 
-#: g10/photoid.c:150
+#: g10/photoid.c:257
 #, c-format
 msgid "'%s' is not a JPEG file\n"
 msgstr "'%s' �是 JPEG 圖檔\n"
 
-#: g10/photoid.c:169
+#: g10/photoid.c:276
 msgid "Is this photo correct (y/N/q)? "
 msgstr "這張照片正確嗎? (y/N/q) "
 
-#: g10/photoid.c:314
+#: g10/photoid.c:421
 #, c-format
 msgid "no remote program execution supported\n"
 msgstr "沒有支�的�端程�執行\n"
 
-#: g10/photoid.c:486
+#: g10/photoid.c:593
 #, c-format
 msgid "this platform requires temporary files when calling external programs\n"
 msgstr "在這個作業平�上�用外部程�時需�暫存檔\n"
 
-#: g10/photoid.c:506
+#: g10/photoid.c:613
 #, 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:624 g10/photoid.c:701
 #, c-format
 msgid "unnatural exit of external program\n"
 msgstr "外部程��自然地離開\n"
 
-#: g10/photoid.c:582
+#: g10/photoid.c:689
 #, c-format
 msgid "system error while calling external program: %s\n"
 msgstr "�用外部程�時發生系統錯誤: %s\n"
 
-#: g10/photoid.c:600
+#: g10/photoid.c:707
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) '%s': %s\n"
 msgstr "警告: 無法移除暫存檔 (%s) '%s': %s\n"
 
-#: g10/photoid.c:604
+#: g10/photoid.c:711
 #, c-format
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "警告: 無法移除暫存目錄 '%s': %s\n"
 
-#: g10/photoid.c:635
+#: g10/photoid.c:742
 #, c-format
 msgid ""
 "external program calls are disabled due to unsafe options file permissions\n"
 msgstr "因為�安全的檔案權��項, 而�用了外部程��用\n"
 
-#: g10/photoid.c:715
+#: g10/photoid.c:822
 #, c-format
 msgid "unable to display photo ID!\n"
 msgstr "無法顯示照片 ID!\n"
@@ -6919,12 +6926,12 @@ msgstr "未知的�設收件者 \"%s\"\n"
 msgid "no valid addressees\n"
 msgstr "沒有有效的地�\n"
 
-#: g10/pkclist.c:1743
+#: g10/pkclist.c:1741
 #, c-format
 msgid "Note: key %s has no %s feature\n"
 msgstr "請注�: 金鑰 %s 沒有 %s 功能\n"
 
-#: g10/pkclist.c:1768
+#: g10/pkclist.c:1766
 #, c-format
 msgid "Note: key %s has no preference for %s\n"
 msgstr "警告: 金鑰 %s 沒有 %s 的�好設定\n"
@@ -7960,7 +7967,7 @@ msgstr "正在使用 %s 信任模型\n"
 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"
@@ -7990,37 +7997,37 @@ msgstr "請�一次 --check-trustdb\n"
 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"
 msgstr[0] "目�已處� %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"
 msgstr[0] "已經處�了 %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"
@@ -8155,7 +8162,7 @@ msgstr ""
 #. 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:5128 scd/app-nks.c:1535
+#: scd/app-piv.c:1770 scd/app-p15.c:5157 scd/app-nks.c:1537
 #: scd/app-openpgp.c:2420
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
@@ -8163,7 +8170,7 @@ 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:5147 scd/app-nks.c:1554
+#: scd/app-piv.c:1787 scd/app-p15.c:5176 scd/app-nks.c:1556
 #: scd/app-openpgp.c:2436
 #, c-format
 msgid "Remaining attempts: %d"
@@ -8205,7 +8212,7 @@ msgstr "|A|請輸入管�者 PIN"
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "|P|請輸入標準金鑰的 PIN �設碼 (PUK)."
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2703
+#: scd/app-piv.c:1888 scd/app-nks.c:1667 scd/app-openpgp.c:2703
 #: scd/app-openpgp.c:2727 scd/app-openpgp.c:2905 scd/app-openpgp.c:2927
 #: scd/app-openpgp.c:3108 scd/app-openpgp.c:3395 scd/app-openpgp.c:3442
 #: scd/app-openpgp.c:3580 scd/app-dinsig.c:302
@@ -8293,70 +8300,70 @@ msgstr[0] "金鑰產生完畢 (%d 秒)\n"
 msgid "response does not contain the public key data\n"
 msgstr "回應中未包�公鑰資料\n"
 
-#: scd/app-p15.c:5226 scd/app-nks.c:2094
+#: scd/app-p15.c:5255 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:5229 scd/app-openpgp.c:2852
+#: scd/app-p15.c:5258 scd/app-openpgp.c:2852
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|請輸入管�者 PIN"
 
-#: scd/app-p15.c:5231 scd/app-nks.c:2084
+#: scd/app-p15.c:5260 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:5234 scd/app-nks.c:2075
+#: scd/app-p15.c:5263 scd/app-nks.c:2089
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||請輸入標準金鑰的個人識別碼 (PIN)."
 
-#: scd/app-nks.c:1473 scd/app-openpgp.c:4356
+#: scd/app-nks.c:1475 scd/app-openpgp.c:4356
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 模組缺�或者並� %d �元大\n"
 
-#: scd/app-nks.c:1481 scd/app-openpgp.c:4368
+#: scd/app-nks.c:1483 scd/app-openpgp.c:4368
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公用指數缺�或者大於 %d �元\n"
 
-#: scd/app-nks.c:1654
+#: 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:1701
+#: scd/app-nks.c:1703
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN 還沒有變更�\n"
 
-#: scd/app-nks.c:2074
+#: scd/app-nks.c:2088
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|請輸入標準金鑰將採用的新個人識別碼 (PIN)."
 
-#: scd/app-nks.c:2082
+#: 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:2092
+#: 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:2102
+#: 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:2104
+#: 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:2277 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
+#: scd/app-nks.c:2291 scd/app-openpgp.c:3476 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "�得新的個人識別碼 (PIN) 時出錯: %s\n"
@@ -8613,13 +8620,13 @@ msgstr "用於 fd %d 的經手程�已啟動\n"
 msgid "handler for fd %d terminated\n"
 msgstr "用於 fd %d 的經手程�已終止\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
+#: sm/call-agent.c:1098 sm/certlist.c:143 sm/keylist.c:338
 #: dirmngr/validate.c:1263
 #, 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 ""
 
@@ -8628,11 +8635,11 @@ msgstr ""
 msgid "validation model requested by certificate: %s"
 msgstr "憑證所�求的驗證模型: %s"
 
-#: sm/certchain.c:199 sm/certchain.c:2178
+#: sm/certchain.c:199 sm/certchain.c:2211
 msgid "chain"
 msgstr "chain"
 
-#: sm/certchain.c:200 sm/certchain.c:2178
+#: sm/certchain.c:200 sm/certchain.c:2211
 msgid "shell"
 msgstr "shell"
 
@@ -8655,234 +8662,234 @@ msgstr "關�已標記原則沒有已組態的原則"
 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:355 sm/certchain.c:385 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:359 sm/certchain.c:389 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:597 sm/keydb.c:1913 sm/keydb.c:2002
 #, c-format
 msgid "failed to get the fingerprint\n"
 msgstr "�得指紋失敗\n"
 
-#: sm/certchain.c:625
+#: sm/certchain.c:626
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "從外部�置尋找發行者\n"
 
-#: sm/certchain.c:645
+#: sm/certchain.c:646
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "��的發行者數�: %d\n"
 
-#: sm/certchain.c:724 dirmngr/ocsp.c:740
+#: sm/certchain.c:725 dirmngr/ocsp.c:752
 #, c-format
 msgid "can't get authorityInfoAccess: %s\n"
 msgstr "無法�得 authorityInfoAccess: %s\n"
 
-#: sm/certchain.c:792
+#: sm/certchain.c:793
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "從 Dirmngr 快�尋找發行者\n"
 
-#: sm/certchain.c:817
+#: sm/certchain.c:818
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "��的憑證數�: %d\n"
 
-#: sm/certchain.c:820
+#: sm/certchain.c:821
 #, 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/certchain.c:1048 sm/certchain.c:1593 sm/certchain.c:2239
 #: 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
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "�置 keyDB 代號失敗\n"
 
-#: sm/certchain.c:1233
+#: sm/certchain.c:1260 sm/certchain.c:1264
 msgid "certificate has been revoked"
 msgstr "憑證已撤銷"
 
-#: sm/certchain.c:1248
+#: sm/certchain.c:1279
 msgid "the status of the certificate is unknown"
 msgstr "憑證的狀態未知"
 
-#: sm/certchain.c:1255
+#: sm/certchain.c:1286
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "請確� \"dirmngr\" 已安�妥善\n"
 
-#: sm/certchain.c:1261
+#: sm/certchain.c:1292
 #, 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:1321 sm/certchain.c:1389 dirmngr/validate.c:498
 #, 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:1336 sm/certchain.c:1421 dirmngr/validate.c:516
 #, c-format
 msgid "certificate not yet valid"
 msgstr "憑證尚未生效"
 
-#: sm/certchain.c:1306 sm/certchain.c:1391
+#: sm/certchain.c:1337 sm/certchain.c:1422
 msgid "root certificate not yet valid"
 msgstr "根憑證尚未生效"
 
-#: sm/certchain.c:1307 sm/certchain.c:1392
+#: sm/certchain.c:1338 sm/certchain.c:1423
 msgid "intermediate certificate not yet valid"
 msgstr "媒介憑證尚未生效"
 
-#: sm/certchain.c:1320 dirmngr/validate.c:527
+#: sm/certchain.c:1351 dirmngr/validate.c:527
 #, c-format
 msgid "certificate has expired"
 msgstr "憑證已�期"
 
-#: sm/certchain.c:1321
+#: sm/certchain.c:1352
 msgid "root certificate has expired"
 msgstr "根憑證已�期"
 
-#: sm/certchain.c:1322
+#: sm/certchain.c:1353
 msgid "intermediate certificate has expired"
 msgstr "媒介憑證已�期"
 
-#: sm/certchain.c:1364
+#: sm/certchain.c:1395
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "�失所需的憑證屬性: %s%s%s"
 
-#: sm/certchain.c:1373
+#: sm/certchain.c:1404
 msgid "certificate with invalid validity"
 msgstr "有效性無效的憑證"
 
-#: sm/certchain.c:1410
+#: sm/certchain.c:1441
 msgid "signature not created during lifetime of certificate"
 msgstr "簽章並�在憑證生存時間內所造"
 
-#: sm/certchain.c:1412
+#: sm/certchain.c:1443
 msgid "certificate not created during lifetime of issuer"
 msgstr "憑證並�在發行者生存時間內所造"
 
-#: sm/certchain.c:1413
+#: sm/certchain.c:1444
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "媒介憑證並�在發行者生存時間內所造"
 
-#: sm/certchain.c:1417
+#: sm/certchain.c:1448
 #, c-format
 msgid "  (  signature created at "
 msgstr "  (            簽章建立於 "
 
-#: sm/certchain.c:1418
+#: sm/certchain.c:1449
 #, c-format
 msgid "  (certificate created at "
 msgstr "  (            憑證建立於 "
 
-#: sm/certchain.c:1421
+#: sm/certchain.c:1452
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  (憑證有效自 "
 
-#: sm/certchain.c:1422
+#: sm/certchain.c:1453
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  (        發行者有效自 "
 
-#: sm/certchain.c:1452 dirmngr/validate.c:578
+#: sm/certchain.c:1483 dirmngr/validate.c:578
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "指紋=%s\n"
 
-#: sm/certchain.c:1461
+#: sm/certchain.c:1492
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "根憑證�在已標記為已信任\n"
 
-#: sm/certchain.c:1474
+#: sm/certchain.c:1505
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "在 gpg-agent 中未啟用互動�標記為已信任\n"
 
-#: sm/certchain.c:1480
+#: sm/certchain.c:1511
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "互動�標記為已信任在此作業階段中已�用\n"
 
-#: sm/certchain.c:1539
+#: sm/certchain.c:1570
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "警告: 簽章創造時間未知 - �設為此刻"
 
-#: sm/certchain.c:1603
+#: sm/certchain.c:1634
 msgid "no issuer found in certificate"
 msgstr "憑證中找�到發行者"
 
-#: sm/certchain.c:1681
+#: sm/certchain.c:1712
 msgid "self-signed certificate has a BAD signature"
 msgstr "自簽憑證有 �良 簽章"
 
-#: sm/certchain.c:1754 dirmngr/validate.c:576
+#: sm/certchain.c:1785 dirmngr/validate.c:576
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "根憑證未標記為已信任"
 
-#: sm/certchain.c:1770
+#: sm/certchain.c:1801
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "檢查信任清單時失敗: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
+#: sm/certchain.c:1832 sm/import.c:175 sm/keylist.c:1514 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "憑證�太長\n"
 
-#: sm/certchain.c:1813 dirmngr/validate.c:643
+#: sm/certchain.c:1844 dirmngr/validate.c:643
 #, c-format
 msgid "issuer certificate not found"
 msgstr "找�到發行者憑證"
 
-#: sm/certchain.c:1848 dirmngr/validate.c:669
+#: sm/certchain.c:1879 dirmngr/validate.c:669
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "憑證有 �良 簽章"
 
-#: sm/certchain.c:1880 dirmngr/validate.c:693
+#: sm/certchain.c:1911 dirmngr/validate.c:693
 msgid "found another possible matching CA certificate - trying again"
 msgstr "找到了�一個�能��的 CA 憑證 - 正�試一次"
 
-#: sm/certchain.c:1939 dirmngr/validate.c:718
+#: sm/certchain.c:1970 dirmngr/validate.c:718
 #, 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:2012 sm/certchain.c:2315 dirmngr/validate.c:748
 #, c-format
 msgid "certificate is good\n"
 msgstr "憑證完好\n"
 
-#: sm/certchain.c:1982
+#: sm/certchain.c:2013
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "媒介憑證良好\n"
 
-#: sm/certchain.c:1983
+#: sm/certchain.c:2014
 #, c-format
 msgid "root certificate is good\n"
 msgstr "根憑證完好\n"
 
-#: sm/certchain.c:2165
+#: sm/certchain.c:2198
 msgid "switching to chain model"
 msgstr "切�至�模型"
 
-#: sm/certchain.c:2174
+#: sm/certchain.c:2207
 #, c-format
 msgid "validation model used: %s"
 msgstr "已使用的驗證模型: %s"
@@ -8905,7 +8912,7 @@ msgstr "超出核心\n"
 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:851
+#: sm/certdump.c:81 sm/certdump.c:109 sm/certdump.c:232 dirmngr/ocsp.c:891
 msgid "none"
 msgstr "ç„¡"
 
@@ -8939,42 +8946,42 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "建立於 %s, 於 %s 到期.\n"
 
-#: sm/certlist.c:123 dirmngr/validate.c:1253
+#: sm/certlist.c:133 dirmngr/validate.c:1253
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "沒有指定的金鑰用途 - �設為所有的用途\n"
 
-#: sm/certlist.c:144 dirmngr/validate.c:1294
+#: sm/certlist.c:154 dirmngr/validate.c:1294
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "憑證應該還未被用於憑證\n"
 
-#: sm/certlist.c:157 dirmngr/validate.c:1304
+#: sm/certlist.c:167 dirmngr/validate.c:1304
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "憑證應該還未被用於 OCSP 回應簽署\n"
 
-#: sm/certlist.c:173 dirmngr/validate.c:1287
+#: sm/certlist.c:184 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "憑證應該還未被用於加密\n"
 
-#: sm/certlist.c:174 dirmngr/validate.c:1277
+#: sm/certlist.c:186 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "憑證應該還未被用於簽署\n"
 
-#: sm/certlist.c:175 dirmngr/validate.c:1288
+#: sm/certlist.c:188 dirmngr/validate.c:1288
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "憑證無法用於加密\n"
 
-#: sm/certlist.c:176 dirmngr/validate.c:1278
+#: sm/certlist.c:189 dirmngr/validate.c:1278
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "憑證無法用於簽署\n"
 
-#: sm/certlist.c:366
+#: sm/certlist.c:379
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9523,7 +9530,7 @@ msgstr "簽署者 %d 所用的雜湊演算法: %s (%s)\n"
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "檢查�格憑證時失敗: %s\n"
 
-#: sm/sign.c:913
+#: sm/sign.c:916
 #, fuzzy, c-format
 #| msgid "Signature made %s using %s key ID %s\n"
 msgid "%s/%s signature using %s key %s\n"
@@ -9715,7 +9722,7 @@ msgstr "正在移除快�檔案 '%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:372 dirmngr/crlcache.c:1118 dirmngr/crlcache.c:2432
 #, c-format
 msgid "error closing cache file: %s\n"
 msgstr "關閉快�檔案時出錯: %s\n"
@@ -9959,197 +9966,197 @@ msgstr "未知的雜湊演算法 '%s'\n"
 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:1849 dirmngr/ocsp.c:503
 #, c-format
 msgid "creating S-expression failed: %s\n"
 msgstr "建立 S-表示�時失敗: %s\n"
 
-#: dirmngr/crlcache.c:1922
+#: dirmngr/crlcache.c:1923
 #, c-format
 msgid "ksba_crl_parse failed: %s\n"
 msgstr "ksba_crl_parse 失敗: %s\n"
 
-#: dirmngr/crlcache.c:1937
+#: dirmngr/crlcache.c:1938
 #, c-format
 msgid "error getting update times of CRL: %s\n"
 msgstr "�得 CRL 更新時間時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1944
+#: dirmngr/crlcache.c:1945
 #, 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:1949
 #, c-format
 msgid "nextUpdate not given; assuming a validity period of one day\n"
 msgstr "無給定 nextUpdate; 先�設有效期是一天\n"
 
-#: dirmngr/crlcache.c:1968
+#: dirmngr/crlcache.c:1969
 #, c-format
 msgid "error getting CRL item: %s\n"
 msgstr "�得 CRL 項目時出錯: %s\n"
 
-#: dirmngr/crlcache.c:1983
+#: dirmngr/crlcache.c:1984
 #, c-format
 msgid "error inserting item into temporary cache file: %s\n"
 msgstr "安�項目至暫存快�檔案時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2010
+#: dirmngr/crlcache.c:2011
 #, c-format
 msgid "no CRL issuer found in CRL: %s\n"
 msgstr "CRL 中找�到 CRL 發行者: %s\n"
 
-#: dirmngr/crlcache.c:2025
+#: dirmngr/crlcache.c:2026
 #, c-format
 msgid "locating CRL issuer certificate by authorityKeyIdentifier\n"
 msgstr "正在以 authorityKeyIdentifier 找出 CRL 發行者憑證�置\n"
 
-#: dirmngr/crlcache.c:2071
+#: dirmngr/crlcache.c:2072
 #, c-format
 msgid "CRL signature verification failed: %s\n"
 msgstr "CRL 簽章驗證失敗: %s\n"
 
-#: dirmngr/crlcache.c:2083
+#: dirmngr/crlcache.c:2084
 #, c-format
 msgid "error checking validity of CRL issuer certificate: %s\n"
 msgstr "檢查 CRL 發行者憑證有效性時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2225
+#: dirmngr/crlcache.c:2226
 #, c-format
 msgid "ksba_crl_new failed: %s\n"
 msgstr "ksba_crl_new 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2232
+#: dirmngr/crlcache.c:2233
 #, c-format
 msgid "ksba_crl_set_reader failed: %s\n"
 msgstr "ksba_crl_set_reader 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2266
+#: dirmngr/crlcache.c:2267
 #, c-format
 msgid "removed stale temporary cache file '%s'\n"
 msgstr "已移除陳舊的暫存快�檔案 '%s'\n"
 
-#: dirmngr/crlcache.c:2270
+#: dirmngr/crlcache.c:2271
 #, c-format
 msgid "problem removing stale temporary cache file '%s': %s\n"
 msgstr "移除陳舊的暫存快�檔案 '%s' 時發生�題: %s\n"
 
-#: dirmngr/crlcache.c:2280
+#: dirmngr/crlcache.c:2281
 #, c-format
 msgid "error creating temporary cache file '%s': %s\n"
 msgstr "建立暫存快�檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2290
+#: dirmngr/crlcache.c:2291
 #, c-format
 msgid "crl_parse_insert failed: %s\n"
 msgstr "crl_parse_insert 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2300
+#: dirmngr/crlcache.c:2301
 #, c-format
 msgid "error finishing temporary cache file '%s': %s\n"
 msgstr "完�暫存快�檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2307
+#: dirmngr/crlcache.c:2308
 #, c-format
 msgid "error closing temporary cache file '%s': %s\n"
 msgstr "關閉暫存快�檔案 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2332
+#: dirmngr/crlcache.c:2333
 #, 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:2337
 #, c-format
 msgid "new CRL still too old; it expired on %s\n"
 msgstr "新的 CRL �然太�舊; 早已在 %s 逾期\n"
 
-#: dirmngr/crlcache.c:2352
+#: dirmngr/crlcache.c:2353
 #, c-format
 msgid "unknown critical CRL extension %s\n"
 msgstr "未知的關� CRL 擴充欄� %s\n"
 
-#: dirmngr/crlcache.c:2362
+#: dirmngr/crlcache.c:2363
 #, c-format
 msgid "error reading CRL extensions: %s\n"
 msgstr "讀� CRL 擴充欄�時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2413
+#: dirmngr/crlcache.c:2414
 #, c-format
 msgid "creating cache file '%s'\n"
 msgstr "建立快�檔案 '%s' 時出錯\n"
 
-#: dirmngr/crlcache.c:2445
+#: dirmngr/crlcache.c:2446
 #, c-format
 msgid "problem renaming '%s' to '%s': %s\n"
 msgstr "把 '%s' �新新命� '%s' 時發生�題: %s\n"
 
-#: dirmngr/crlcache.c:2459
+#: dirmngr/crlcache.c:2460
 #, 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:2497
 #, c-format
 msgid "Begin CRL dump (retrieved via %s)\n"
 msgstr "開始 CRL 傾� (經由 %s �得)\n"
 
-#: dirmngr/crlcache.c:2519
+#: dirmngr/crlcache.c:2520
 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:2523
 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:2526
 msgid " ERROR: The CRL will not be used\n"
 msgstr " 錯誤: 將�採用此 CRL\n"
 
-#: dirmngr/crlcache.c:2532
+#: dirmngr/crlcache.c:2533
 msgid " ERROR: This cached CRL may have been tampered with!\n"
 msgstr " 錯誤: 這個快�中的 CRL �能已�竄改!\n"
 
-#: dirmngr/crlcache.c:2550
+#: dirmngr/crlcache.c:2551
 #, c-format
 msgid " WARNING: invalid cache record length\n"
 msgstr " 警告: 無效的快�記錄長度\n"
 
-#: dirmngr/crlcache.c:2557
+#: dirmngr/crlcache.c:2558
 #, c-format
 msgid "problem reading cache record: %s\n"
 msgstr "讀�快�記錄時發生�題: %s\n"
 
-#: dirmngr/crlcache.c:2568
+#: dirmngr/crlcache.c:2569
 #, c-format
 msgid "problem reading cache key: %s\n"
 msgstr "讀�快�金鑰時發生�題: %s\n"
 
-#: dirmngr/crlcache.c:2599
+#: dirmngr/crlcache.c:2600
 #, c-format
 msgid "error reading cache entry from db: %s\n"
 msgstr "從資料庫讀�快�項目時出錯: %s\n"
 
-#: dirmngr/crlcache.c:2602
+#: dirmngr/crlcache.c:2603
 msgid "End CRL dump\n"
 msgstr "CRL 傾���\n"
 
-#: dirmngr/crlcache.c:2722
+#: dirmngr/crlcache.c:2723
 #, c-format
 msgid "crl_fetch via DP failed: %s\n"
 msgstr "經由 DP 的 crl_fetch 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2733
+#: dirmngr/crlcache.c:2734
 #, c-format
 msgid "crl_cache_insert via DP failed: %s\n"
 msgstr "經由 DP 的 crl_cache_insert 失敗: %s\n"
 
-#: dirmngr/crlcache.c:2779
+#: dirmngr/crlcache.c:2780
 #, c-format
 msgid "crl_cache_insert via issuer failed: %s\n"
 msgstr "經由發行者的 crl_cache_insert 失敗: %s\n"
@@ -10495,12 +10502,12 @@ msgstr "用法: %s [�項] "
 msgid "colons are not allowed in the socket name\n"
 msgstr "socket �稱內��許使用冒號\n"
 
-#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1593 dirmngr/server.c:1901
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "從 '%s' �回 CRL 時失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1599 dirmngr/server.c:1907
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "從 '%s' 處� CRL 時失敗: %s\n"
@@ -10747,91 +10754,91 @@ msgstr "計算 '%s' OSCP 回應雜湊時失敗: %s\n"
 msgid "not signed by a default OCSP signer's certificate"
 msgstr "並未由�設 OCSP 簽署者的憑證所簽署"
 
-#: dirmngr/ocsp.c:582
+#: dirmngr/ocsp.c:585
 #, c-format
 msgid "allocating list item failed: %s\n"
 msgstr "�置清單項目時失敗: %s\n"
 
-#: dirmngr/ocsp.c:598 dirmngr/ocsp.c:782
+#: dirmngr/ocsp.c:601 dirmngr/ocsp.c:794
 #, c-format
 msgid "error getting responder ID: %s\n"
 msgstr "�得回應程� ID 時出錯: %s\n"
 
-#: dirmngr/ocsp.c:642
+#: dirmngr/ocsp.c:645
 #, c-format
 msgid "no suitable certificate found to verify the OCSP response\n"
 msgstr "找�到��用來驗證 OCSP 回應的憑證\n"
 
-#: dirmngr/ocsp.c:681 dirmngr/validate.c:649
+#: dirmngr/ocsp.c:693 dirmngr/validate.c:649
 #, c-format
 msgid "issuer certificate not found: %s\n"
 msgstr "找�到發行者憑證: %s\n"
 
-#: dirmngr/ocsp.c:691
+#: dirmngr/ocsp.c:703
 #, c-format
 msgid "caller did not return the target certificate\n"
 msgstr "�用者未傳為目標憑證\n"
 
-#: dirmngr/ocsp.c:698
+#: dirmngr/ocsp.c:710
 #, c-format
 msgid "caller did not return the issuing certificate\n"
 msgstr "�用者未傳回發行的憑證\n"
 
-#: dirmngr/ocsp.c:708
+#: dirmngr/ocsp.c:720
 #, c-format
 msgid "failed to allocate OCSP context: %s\n"
 msgstr "�置 OCSP 脈絡失敗: %s\n"
 
-#: dirmngr/ocsp.c:747
+#: dirmngr/ocsp.c:759
 #, c-format
 msgid "no default OCSP responder defined\n"
 msgstr "無定義�設 OCSP 回應程�\n"
 
-#: dirmngr/ocsp.c:753
+#: dirmngr/ocsp.c:765
 #, c-format
 msgid "no default OCSP signer defined\n"
 msgstr "未定義�設的 OCSP 簽署程�\n"
 
-#: dirmngr/ocsp.c:760
+#: dirmngr/ocsp.c:772
 #, c-format
 msgid "using default OCSP responder '%s'\n"
 msgstr "正在使用�設的 OCSP 回應程� '%s'\n"
 
-#: dirmngr/ocsp.c:765
+#: dirmngr/ocsp.c:777
 #, c-format
 msgid "using OCSP responder '%s'\n"
 msgstr "正在使用 %s OCSP 回應程�\n"
 
-#: dirmngr/ocsp.c:822
+#: dirmngr/ocsp.c:834
 #, c-format
 msgid "error getting OCSP status for target certificate: %s\n"
 msgstr "�得目標憑證 OCSP 狀態時出錯: %s\n"
 
-#: dirmngr/ocsp.c:847
+#: dirmngr/ocsp.c:887
 #, c-format
 msgid "certificate status is: %s  (this=%s  next=%s)\n"
 msgstr "憑證狀態為: %s  (本次=%s  下次=%s)\n"
 
-#: dirmngr/ocsp.c:848
+#: dirmngr/ocsp.c:888
 msgid "good"
 msgstr "良好"
 
-#: dirmngr/ocsp.c:854
+#: dirmngr/ocsp.c:894
 #, c-format
 msgid "certificate has been revoked at: %s due to: %s\n"
 msgstr "憑證已撤銷於 %s 因: %s\n"
 
-#: dirmngr/ocsp.c:889
+#: dirmngr/ocsp.c:919
 #, c-format
 msgid "OCSP responder returned a status in the future\n"
 msgstr "OCSP 回應程�傳回未來的狀態\n"
 
-#: dirmngr/ocsp.c:901
+#: dirmngr/ocsp.c:931
 #, c-format
 msgid "OCSP responder returned a non-current status\n"
 msgstr "OCSP 回應程�傳回�當下的狀態\n"
 
-#: dirmngr/ocsp.c:916
+#: dirmngr/ocsp.c:946
 #, c-format
 msgid "OCSP responder returned an too old status\n"
 msgstr "OCSP 回應程�傳回�舊的狀態\n"
@@ -10845,63 +10852,63 @@ msgstr "assuan_inquire(%s) 失敗: %s\n"
 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:2718 dirmngr/server.c:2733
+#: dirmngr/server.c:1455 dirmngr/server.c:1543 dirmngr/server.c:1986
+#: dirmngr/server.c:2057 dirmngr/server.c:2734 dirmngr/server.c:2749
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire 失敗: %s\n"
 
-#: dirmngr/server.c:1576
+#: dirmngr/server.c:1592
 #, 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:1604 dirmngr/server.c:1635 dirmngr/server.c:1795
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "�出資料時出錯: %s\n"
 
-#: dirmngr/server.c:1727
+#: dirmngr/server.c:1743
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch 失敗: %s\n"
 
-#: dirmngr/server.c:1760
+#: dirmngr/server.c:1776
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert 失敗: %s\n"
 
-#: dirmngr/server.c:1787
+#: dirmngr/server.c:1803
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "max_replies %d 已超出\n"
 
-#: dirmngr/server.c:3022
+#: dirmngr/server.c:3038
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "無法�置控制�構: %s\n"
 
-#: dirmngr/server.c:3033
+#: dirmngr/server.c:3049
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "�置 assuan 脈絡失敗: %s\n"
 
-#: dirmngr/server.c:3054
+#: dirmngr/server.c:3070
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "伺�器啟始失敗: %s\n"
 
-#: dirmngr/server.c:3062
+#: dirmngr/server.c:3078
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "� Assuan 註冊指令時失敗: %s\n"
 
-#: dirmngr/server.c:3095
+#: dirmngr/server.c:3111
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan 接��題: %s\n"
 
-#: dirmngr/server.c:3114
+#: dirmngr/server.c:3130
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan 處�時失敗: %s\n"
@@ -11227,92 +11234,107 @@ msgstr ""
 "語法: gpg-check-pattern [�項] 樣�檔案\n"
 "用樣�檔案來檢查由標準輸入給定的密語\n"
 
-#: tools/gpg-card.c:2421
+#: 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:2424
+#: 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:2427
+#: 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:2580 tools/gpg-card.c:2743 tools/gpg-card.c:2966
-#: tools/gpg-card.c:3075
+#: 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:3427
+#: tools/gpg-card.c:3431
 #, c-format
 msgid "User Interaction Flag is set to \"%s\" - can't change\n"
 msgstr ""
 
-#: tools/gpg-card.c:3437 tools/gpg-card.c:3451
+#: 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:3454
+#: tools/gpg-card.c:3458
 #, c-format
 msgid "Please use \"uif --yes %d %s\"\n"
 msgstr ""
 
-#: tools/gpg-card.c:3700
+#: tools/gpg-card.c:3758
 #, fuzzy
 #| msgid "add a certificate to the cache"
 msgid "authenticate to the card"
 msgstr "加入憑證至快�"
 
-#: tools/gpg-card.c:3702
+#: tools/gpg-card.c:3760
 msgid "send a reset to the card daemon"
 msgstr ""
 
-#: tools/gpg-card.c:3704
+#: tools/gpg-card.c:3762
 #, fuzzy
 #| msgid "|NAME|use user NAME for authentication"
 msgid "setup KDF for PIN authentication"
 msgstr "|�字|使用指定�字�為�證用的使用者�稱"
 
-#: tools/gpg-card.c:3706
+#: tools/gpg-card.c:3764
 msgid "change a private data object"
 msgstr ""
 
-#: tools/gpg-card.c:3707
+#: 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:3708
+#: 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:3709
+#: tools/gpg-card.c:3767
 msgid "store a private key to a data object"
 msgstr ""
 
-#: tools/gpg-card.c:3710
+#: tools/gpg-card.c:3768
 msgid "Yubikey management commands"
 msgstr ""
 
-#: tools/gpg-card.c:3712
+#: 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"
 
diff --git a/scd/Makefile.in b/scd/Makefile.in
index bd50556..f371adb 100644
--- a/scd/Makefile.in
+++ b/scd/Makefile.in
@@ -446,16 +446,6 @@ AM_CPPFLAGS = $(LIBUSB_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)
-@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
diff --git a/scd/apdu.c b/scd/apdu.c
index e83815b..ffada1d 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -773,7 +773,14 @@ pcsc_send_apdu (int slot, unsigned char *apdu, size_t apdulen,
     return err;
 
   if (DBG_CARD_IO)
-    log_printhex (apdu, apdulen, "  PCSC_data:");
+    {
+      /* Do not dump the PIN in a VERIFY command.  */
+      if (apdulen > 5 && apdu[1] == 0x20)
+        log_debug ("PCSC_data: %02X %02X %02X %02X %02X [redacted]\n",
+                   apdu[0], apdu[1], apdu[2], apdu[3], apdu[4]);
+      else
+        log_printhex (apdu, apdulen, "PCSC_data:");
+    }
 
   if ((reader_table[slot].pcsc.protocol & PCSC_PROTOCOL_T1))
       send_pci.protocol = PCSC_PROTOCOL_T1;
@@ -1555,7 +1562,14 @@ send_apdu_ccid (int slot, unsigned char *apdu, size_t apdulen,
     return err;
 
   if (DBG_CARD_IO)
-    log_printhex (apdu, apdulen, " raw apdu:");
+    {
+      /* Do not dump the PIN in a VERIFY command.  */
+      if (apdulen > 5 && apdu[1] == 0x20)
+        log_debug (" raw apdu: %02x%02x%02x%02x%02x [redacted]\n",
+                   apdu[0], apdu[1], apdu[2], apdu[3], apdu[4]);
+      else
+        log_printhex (apdu, apdulen, " raw apdu:");
+    }
 
   maxbuflen = *buflen;
   if (pininfo)
diff --git a/scd/app-nks.c b/scd/app-nks.c
index 468c99c..cdbdde8 100644
--- a/scd/app-nks.c
+++ b/scd/app-nks.c
@@ -450,6 +450,8 @@ keygripstr_from_pk_file (app_t app, int pkfid, int cfid, char *r_gripstr,
 
   if (!err)
     {
+      if (r_algo)
+        *r_algo = algo;
       if (r_algostr)
         {
           *r_algostr = algostr;
@@ -1898,19 +1900,31 @@ do_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo,
     return gpg_error (GPG_ERR_INV_VALUE);
 #undef X
 
-  /* Send an MSE for PSO:Computer_Signature.  */
+  /* Send an MSE for PSO:Compute_Signature.  */
   if (app->appversion > 2 && app->app_local->active_nks_app != NKS_APP_ESIGN)
     {
       unsigned char mse[6];
+      unsigned int mselen;
 
-      mse[0] = 0x80; /* Algorithm reference.  */
-      mse[1] = 1;
-      mse[2] = 2;    /* RSA, card does pkcs#1 v1.5 padding, no ASN.1 check.  */
-      mse[3] = 0x84; /* Private key reference.  */
-      mse[4] = 1;
-      mse[5] = kid;
+      if (algo == GCRY_PK_ECC)
+        {
+          mse[0] = 0x84; /* Private key reference.  */
+          mse[1] = 1;
+          mse[2] = kid;
+          mselen = 3;
+        }
+      else /* RSA */
+        {
+          mse[0] = 0x80; /* Algorithm reference.  */
+          mse[1] = 1;
+          mse[2] = 2;    /* Card does pkcs#1 v1.5 padding, no ASN.1 check.  */
+          mse[3] = 0x84; /* Private key reference.  */
+          mse[4] = 1;
+          mse[5] = kid;
+          mselen = 6;
+        }
       err = iso7816_manage_security_env (app_get_slot (app), 0x41, 0xB6,
-                                         mse, sizeof mse);
+                                         mse, mselen);
     }
 
   if (app->app_local->active_nks_app == NKS_APP_ESIGN)
diff --git a/scd/app-p15.c b/scd/app-p15.c
index 0e92edf..bfd6934 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -744,7 +744,15 @@ select_and_read_record (app_t app, unsigned short efid, int recno,
   /* 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 +1779,9 @@ read_ef_prkdf (app_t app, unsigned short fid, prkdf_object_t *result)
      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 && !buffer[0] && !buffer[1])
+    goto next_record;  /* Deleted record - continue with next */
+
   while (n && *p && *p != 0xff)
     {
       const unsigned char *pp;
@@ -2028,6 +2039,8 @@ read_ef_prkdf (app_t app, unsigned short fid, prkdf_object_t *result)
               err = 0;
             goto leave;
           }
+          if (buflen == 2 && !buffer[0] && !buffer[1])
+            goto next_record;  /* Deleted record - continue with next */
           p = buffer;
           n = buflen;
         }
@@ -2077,6 +2090,9 @@ read_ef_pukdf (app_t app, unsigned short fid, pukdf_object_t *result)
    * 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 && !buffer[0] && !buffer[1])
+    goto next_record;  /* Deleted record - continue with next */
+
   while (n && *p && *p != 0xff)
     {
       const unsigned char *pp;
@@ -2354,6 +2370,8 @@ read_ef_pukdf (app_t app, unsigned short fid, pukdf_object_t *result)
               err = 0;
             goto leave;
           }
+          if (buflen == 2 && !buffer[0] && !buffer[1])
+            goto next_record;  /* Deleted record - continue with next */
           p = buffer;
           n = buflen;
         }
@@ -2404,6 +2422,9 @@ read_ef_cdf (app_t app, unsigned short fid, int cdftype, cdf_object_t *result)
      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 && !buffer[0] && !buffer[1])
+    goto next_record;  /* Deleted record - continue with next */
+
   while (n && *p && *p != 0xff)
     {
       const unsigned char *pp;
@@ -2625,8 +2646,8 @@ read_ef_cdf (app_t app, unsigned short fid, int cdftype, cdf_object_t *result)
       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 +2656,14 @@ read_ef_cdf (app_t app, unsigned short fid, int cdftype, cdf_object_t *result)
           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 && !buffer[0] && !buffer[1])
+            goto next_record;  /* Deleted record - continue with next */
           p = buffer;
           n = buflen;
         }
@@ -2728,6 +2752,9 @@ read_ef_aodf (app_t app, unsigned short fid, aodf_object_t *result)
      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 && !buffer[0] && !buffer[1])
+    goto next_record;  /* Deleted record - continue with next */
+
   while (n && *p && *p != 0xff)
     {
       const unsigned char *pp;
@@ -3299,6 +3326,8 @@ read_ef_aodf (app_t app, unsigned short fid, aodf_object_t *result)
               err = 0;
             goto leave;
           }
+          if (buflen == 2 && !buffer[0] && !buffer[1])
+            goto next_record;  /* Deleted record - continue with next */
           p = buffer;
           n = buflen;
         }
diff --git a/sm/Makefile.am b/sm/Makefile.am
index c676ada..cfcc36c 100644
--- a/sm/Makefile.am
+++ b/sm/Makefile.am
@@ -70,8 +70,8 @@ common_libs = ../kbx/libkeybox509.a $(libcommonpth)
 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 =
 
 
 module_tests =
diff --git a/sm/Makefile.in b/sm/Makefile.in
index af9670c..e4079b4 100644
--- a/sm/Makefile.in
+++ b/sm/Makefile.in
@@ -185,7 +185,7 @@ 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) $(resource_objs) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 gpgsm_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gpgsm_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am__objects_1 =
@@ -498,16 +498,6 @@ AM_CPPFLAGS = -DKEYBOX_WITH_X509=1 -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)
-@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,9 +535,9 @@ common_libs = ../kbx/libkeybox509.a $(libcommonpth)
 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)
+gpgsm_LDFLAGS = 
 module_tests = 
 module_maint_tests = t-minip12
 t_common_src = 
diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c
index 5dd8a39..cc958cc 100644
--- a/sm/call-dirmngr.c
+++ b/sm/call-dirmngr.c
@@ -64,6 +64,8 @@ struct isvalid_status_parm_s {
   ctrl_t ctrl;
   int seen;
   unsigned char fpr[20];
+  gnupg_isotime_t revoked_at;
+  char *revocation_reason;  /* malloced or NULL */
 };
 
 
@@ -491,6 +493,19 @@ isvalid_status_cb (void *opaque, const char *line)
       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_at[15] = 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))
     {
     }
@@ -510,12 +525,17 @@ isvalid_status_cb (void *opaque, const char *line)
 
   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 +544,11 @@ gpgsm_dirmngr_isvalid (ctrl_t ctrl,
   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 +578,8 @@ gpgsm_dirmngr_isvalid (ctrl_t ctrl,
   stparm.ctrl = ctrl;
   stparm.seen = 0;
   memset (stparm.fpr, 0, 20);
+  stparm.revoked_at[0] = 0;
+  stparm.revocation_reason = NULL;
 
   /* It is sufficient to send the options only once because we have
    * one connection per process only.  */
@@ -563,9 +590,8 @@ gpgsm_dirmngr_isvalid (ctrl_t ctrl,
                          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 +604,19 @@ gpgsm_dirmngr_isvalid (ctrl_t ctrl,
   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 +674,9 @@ gpgsm_dirmngr_isvalid (ctrl_t ctrl,
           ksba_cert_release (rspcert);
         }
     }
+
   release_dirmngr (ctrl);
+  xfree (stparm.revocation_reason);
   return rc;
 }
 
diff --git a/sm/certchain.c b/sm/certchain.c
index 4050680..9813eca 100644
--- a/sm/certchain.c
+++ b/sm/certchain.c
@@ -350,7 +350,7 @@ check_cert_policy (ksba_cert_t cert, int listmode, estream_t fplist)
       /* 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;
@@ -380,7 +380,8 @@ check_cert_policy (ksba_cert_t cert, int listmode, estream_t fplist)
                   /* 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 +1188,13 @@ gpgsm_is_root_cert (ksba_cert_t cert)
 
 /* 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 +1204,7 @@ is_cert_still_valid (ctrl_t ctrl, int force_ocsp, int lm, estream_t fp,
     }
 
 
-  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 +1223,20 @@ is_cert_still_valid (ctrl_t ctrl, int force_ocsp, int lm, estream_t fp,
 
   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 +1246,22 @@ is_cert_still_valid (ctrl_t ctrl, int force_ocsp, int lm, estream_t fp,
       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,
@@ -2158,10 +2189,12 @@ gpgsm_validate_chain (ctrl_t ctrl, ksba_cert_t cert, ksba_isotime_t checktime,
     {
       *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))
     {
+      /* 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.  */
       do_list (0, listmode, listfp, _("switching to chain model"));
       rc = do_validate_chain (ctrl, cert, checktime,
                               r_exptime, listmode, listfp,
diff --git a/sm/certlist.c b/sm/certlist.c
index f06a23f..b5f9f78 100644
--- a/sm/certlist.c
+++ b/sm/certlist.c
@@ -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_emailProtection[]= "1.3.6.1.5.5.7.3.4";
 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
@@ -119,7 +129,7 @@ cert_usage_p (ksba_cert_t cert, int mode, int silent)
       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;
         }
@@ -136,7 +146,7 @@ cert_usage_p (ksba_cert_t cert, int mode, int silent)
       return err;
     }
 
-  if (mode == 4)
+  if (mode == USE_MODE_CERT)
     {
       if ((use & (KSBA_KEYUSAGE_KEY_CERT_SIGN)))
         return 0;
@@ -146,7 +156,7 @@ cert_usage_p (ksba_cert_t cert, int mode, int silent)
       return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
     }
 
-  if (mode == 5)
+  if (mode == USE_MODE_OCSP)
     {
       if (use != ~0
           && (have_ocsp_signing
@@ -160,7 +170,8 @@ cert_usage_p (ksba_cert_t cert, int mode, int silent)
     }
 
   encr_bits = (KSBA_KEYUSAGE_KEY_ENCIPHERMENT|KSBA_KEYUSAGE_DATA_ENCIPHERMENT);
-  if ((opt.compat_flags & COMPAT_ALLOW_KA_TO_ENCR))
+  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);
@@ -169,11 +180,13 @@ cert_usage_p (ksba_cert_t cert, int mode, int silent)
     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);
 }
@@ -183,7 +196,7 @@ cert_usage_p (ksba_cert_t cert, int mode, int silent)
 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);
 }
 
 
@@ -191,31 +204,31 @@ gpgsm_cert_use_sign_p (ksba_cert_t cert, int silent)
 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);
 }
 
 
diff --git a/sm/fingerprint.c b/sm/fingerprint.c
index 70ca0e9..5f3f6f5 100644
--- a/sm/fingerprint.c
+++ b/sm/fingerprint.c
@@ -306,6 +306,14 @@ gpgsm_get_key_algo_info (ksba_cert_t cert, unsigned int *nbits)
 }
 
 
+/* Return true if CERT is an ECC key.  */
+int
+gpgsm_is_ecc_key (ksba_cert_t cert)
+{
+  return GCRY_PK_ECC == gpgsm_get_key_algo_info2 (cert, NULL, NULL);
+}
+
+
 /* This is a wrapper around pubkey_algo_string which takes a KSBA
  * certificate instead of a Gcrypt public key.  Note that this
  * function may return NULL on error.  */
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index bc22d68..f8b3856 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -516,7 +516,7 @@ static int default_include_certs = DEFAULT_INCLUDE_CERTS;
 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,
@@ -2228,6 +2228,8 @@ gpgsm_init_default_ctrl (struct server_control_s *ctrl)
   ctrl->use_ocsp = opt.enable_ocsp;
   ctrl->validation_model = default_validation_model;
   ctrl->offline = opt.disable_dirmngr;
+  ctrl->revoked_at[0] = 0;
+  ctrl->revocation_reason = NULL;
 }
 
 
@@ -2237,6 +2239,8 @@ void
 gpgsm_deinit_default_ctrl (ctrl_t ctrl)
 {
   gpgsm_keydb_deinit_session_data (ctrl);
+  xfree (ctrl->revocation_reason);
+  ctrl->revocation_reason = NULL;
 }
 
 
diff --git a/sm/gpgsm.h b/sm/gpgsm.h
index 8765f9f..ced2d67 100644
--- a/sm/gpgsm.h
+++ b/sm/gpgsm.h
@@ -264,6 +264,10 @@ struct server_control_s
 
   /* 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;
 };
 
 
@@ -324,6 +328,7 @@ char *gpgsm_get_keygrip_hexstring (ksba_cert_t cert);
 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);
@@ -493,9 +498,11 @@ gpg_error_t gpgsm_agent_export_key (ctrl_t ctrl, const char *keygrip,
                                     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);
diff --git a/sm/keydb.c b/sm/keydb.c
index 5b28df7..fbe28f2 100644
--- a/sm/keydb.c
+++ b/sm/keydb.c
@@ -2027,7 +2027,7 @@ keydb_set_cert_flags (ctrl_t ctrl, ksba_cert_t cert, int ephemeral,
   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);
diff --git a/sm/keylist.c b/sm/keylist.c
index 9e2c79c..fabd822 100644
--- a/sm/keylist.c
+++ b/sm/keylist.c
@@ -300,7 +300,7 @@ print_pk_screening (ksba_cert_t cert, int colon_mode, estream_t fp)
 
 
 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;
@@ -352,7 +352,7 @@ print_capabilities (ksba_cert_t cert, estream_t fp)
   /* 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 ((opt.compat_flags & COMPAT_ALLOW_KA_TO_ENCR)
+  if ((algo == GCRY_PK_ECC || (opt.compat_flags & COMPAT_ALLOW_KA_TO_ENCR))
       && (use & KSBA_KEYUSAGE_KEY_AGREEMENT))
     is_encr = 1;
 
@@ -599,7 +599,7 @@ list_cert_colon (ctrl_t ctrl, ksba_cert_t cert, unsigned int validity,
   /* 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);
@@ -1201,6 +1201,15 @@ list_cert_raw (ctrl_t ctrl, KEYDB_HANDLE hd,
     {
       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
@@ -1451,6 +1460,15 @@ list_cert_std (ctrl_t ctrl, ksba_cert_t cert, estream_t fp, int have_secret,
 
       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)
diff --git a/sm/sign.c b/sm/sign.c
index 943589f..9290fc1 100644
--- a/sm/sign.c
+++ b/sm/sign.c
@@ -774,13 +774,16 @@ gpgsm_sign (ctrl_t ctrl, certlist_t signerlist,
 
 
   /* 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)
diff --git a/sm/verify.c b/sm/verify.c
index 10d5d5c..2e40c02 100644
--- a/sm/verify.c
+++ b/sm/verify.c
@@ -634,8 +634,8 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, estream_t out_fp)
 
         /* 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);
diff --git a/tests/cms/Makefile.am b/tests/cms/Makefile.am
index 999bd4f..60fdf02 100644
--- a/tests/cms/Makefile.am
+++ b/tests/cms/Makefile.am
@@ -28,13 +28,15 @@ include $(top_srcdir)/am/cmacros.am
 
 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)" \
 			GNUPG_IN_TEST_SUITE=fact \
-	                GPGSM="$(GPGSM)" "$(srcdir)/runtest"
+	                GPGSM="$(GPGSM)$(EXEEXT)" "$(srcdir)/runtest"
 
 TESTS_ENVIRONMENT = LC_ALL=C \
 	EXEEXT=$(EXEEXT) \
diff --git a/tests/cms/Makefile.in b/tests/cms/Makefile.in
index e7d0669..4f88a25 100644
--- a/tests/cms/Makefile.in
+++ b/tests/cms/Makefile.in
@@ -390,16 +390,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/common -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)
-@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,6 +398,7 @@ libcommonpth = ../common/libcommonpth.a
 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
@@ -415,7 +406,7 @@ AM_CFLAGS =
 OLD_TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \
                         GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
 			GNUPG_IN_TEST_SUITE=fact \
-	                GPGSM="$(GPGSM)" "$(srcdir)/runtest"
+	                GPGSM="$(GPGSM)$(EXEEXT)" "$(srcdir)/runtest"
 
 TESTS_ENVIRONMENT = LC_ALL=C \
 	EXEEXT=$(EXEEXT) \
diff --git a/tests/cms/all-tests.scm b/tests/cms/all-tests.scm
index 78ad006..6d4c582 100644
--- a/tests/cms/all-tests.scm
+++ b/tests/cms/all-tests.scm
@@ -30,12 +30,14 @@
    (make-environment-cache
     (test::scm
      #f
+     #f
      (path-join "tests" "cms" "setup.scm")
      (in-srcdir "tests" "cms" "setup.scm")
      "--" "tests" "gpg")))
 
  (map (lambda (name)
 	(test::scm setup
+                   #f
 		   (path-join "tests" "cms" name)
 		   (in-srcdir "tests" "cms" name)))
       (parse-makefile-expand (in-srcdir "tests" "cms" "Makefile.am")
diff --git a/tests/cms/run-tests.scm b/tests/cms/run-tests.scm
index caae86d..7079ed3 100644
--- a/tests/cms/run-tests.scm
+++ b/tests/cms/run-tests.scm
@@ -28,6 +28,7 @@
 (define setup
   (make-environment-cache (test::scm
 			   #f
+			   #f
 			   (path-join "tests" "cms" "setup.scm")
 			   (in-srcdir "tests" "cms" "setup.scm"))))
 
@@ -35,5 +36,6 @@
 	       (load-tests "tests" "cms")
 	       (map (lambda (name)
 		      (test::scm setup
+			         #f
 				 (path-join "tests" "cms" name)
 				 (in-srcdir "tests" "cms" name))) tests)))
diff --git a/tests/gpgme/Makefile.am b/tests/gpgme/Makefile.am
index fe3d580..ca7be13 100644
--- a/tests/gpgme/Makefile.am
+++ b/tests/gpgme/Makefile.am
@@ -47,6 +47,8 @@ check: xcheck
 
 .PHONY: xcheck
 xcheck:
+	@$(MKDIR_P) setup.scm/tests \
+	  tests/gpg lang/qt/tests lang/python/tests
 	$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \
 	  $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
 
@@ -57,3 +59,6 @@ CLEANFILES = *.log report.xml
 # We need to depend on a couple of programs so that the tests don't
 # start before all programs are built.
 all-local: $(required_pgms)
+
+clean-local:
+	-rm -rf setup.scm/tests tests/gpg lang/qt/tests lang/python/tests
diff --git a/tests/gpgme/Makefile.in b/tests/gpgme/Makefile.in
index afa28b1..78bcfa0 100644
--- a/tests/gpgme/Makefile.in
+++ b/tests/gpgme/Makefile.in
@@ -390,16 +390,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/common -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)
-@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
@@ -530,7 +520,7 @@ maintainer-clean-generic:
 	@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
@@ -597,15 +587,16 @@ uninstall-am:
 .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
 
@@ -623,6 +614,8 @@ check: xcheck
 
 .PHONY: xcheck
 xcheck:
+	@$(MKDIR_P) setup.scm/tests \
+	  tests/gpg lang/qt/tests lang/python/tests
 	$(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \
 	  $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS)
 
@@ -630,6 +623,9 @@ xcheck:
 # start before all programs are built.
 all-local: $(required_pgms)
 
+clean-local:
+	-rm -rf setup.scm/tests tests/gpg lang/qt/tests lang/python/tests
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/tests/gpgme/all-tests.scm b/tests/gpgme/all-tests.scm
index f72f8af..1746c4e 100644
--- a/tests/gpgme/all-tests.scm
+++ b/tests/gpgme/all-tests.scm
@@ -40,6 +40,7 @@
    (make-environment-cache
     (test::scm
      #f
+     #f
      (path-join "tests" "gpgme" "setup.scm" "tests" "gpg")
      (in-srcdir "tests" "gpgme" "setup.scm")
      "--" "tests" "gpg")))
@@ -47,6 +48,7 @@
    (make-environment-cache
     (test::scm
      #f
+     #f
      (path-join "tests" "gpgme" "setup.scm" "lang" "python" "tests")
      (in-srcdir "tests" "gpgme" "setup.scm")
      "--" "lang" "python" "tests")))
@@ -71,6 +73,7 @@
 		     (map (lambda (name)
 			    (apply test::scm
 				   `(,(:setup cmpnts)
+                                     #f
 				     ,(apply path-join
 					     `("tests" "gpgme" ,@(:path cmpnts) ,name))
 				     ,(in-srcdir "tests" "gpgme" "wrap.scm")
diff --git a/tests/gpgscm/Makefile.in b/tests/gpgscm/Makefile.in
index cb1ac84..ce6fb0b 100644
--- a/tests/gpgscm/Makefile.in
+++ b/tests/gpgscm/Makefile.in
@@ -458,16 +458,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/common -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)
-@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
diff --git a/tests/gpgscm/ffi.c b/tests/gpgscm/ffi.c
index b9210c7..ce18e07 100644
--- a/tests/gpgscm/ffi.c
+++ b/tests/gpgscm/ffi.c
@@ -357,6 +357,11 @@ do_get_temp_path (scheme *sc, pointer args)
 #ifdef HAVE_W32_SYSTEM
   if (GetTempPath (MAX_PATH+1, buffer) == 0)
     FFI_RETURN_STRING (sc, "/temp");
+  else
+    {
+      size_t len = strlen (buffer);
+      buffer[len-1] = 0;
+    }
   FFI_RETURN_STRING (sc, buffer);
 #else
   FFI_RETURN_STRING (sc, "/tmp");
@@ -788,7 +793,6 @@ do_spawn_process (scheme *sc, pointer args)
 
   err = gnupg_spawn_process (argv[0], (const char **) &argv[1],
                              NULL,
-                             NULL,
                              flags,
                              &infp, &outfp, &errfp, &pid);
   xfree (argv);
diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm
index eb278e3..db1025b 100644
--- a/tests/gpgscm/tests.scm
+++ b/tests/gpgscm/tests.scm
@@ -493,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*)
@@ -673,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.
@@ -688,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.
@@ -719,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))
 
@@ -768,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
diff --git a/tests/migrations/Makefile.in b/tests/migrations/Makefile.in
index 59107d8..b6ab807 100644
--- a/tests/migrations/Makefile.in
+++ b/tests/migrations/Makefile.in
@@ -390,16 +390,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/common -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)
-@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
diff --git a/tests/migrations/all-tests.scm b/tests/migrations/all-tests.scm
index 421f696..ba95f5c 100644
--- a/tests/migrations/all-tests.scm
+++ b/tests/migrations/all-tests.scm
@@ -28,6 +28,7 @@
 
  (map (lambda (name)
 	(test::scm #f
+		   #f
 		   (path-join "tests" "migrations" name)
 		   (in-srcdir "tests" "migrations" name)))
       (parse-makefile-expand (in-srcdir "tests" "migrations" "Makefile.am")
diff --git a/tests/migrations/from-classic.scm b/tests/migrations/from-classic.scm
index b473d70..2033a4a 100755
--- a/tests/migrations/from-classic.scm
+++ b/tests/migrations/from-classic.scm
@@ -26,7 +26,7 @@
   (call-check `(,@GPG --list-secret-keys)))
 
 (define (assert-migrated)
-  (unless (file-exists? ".gpg-v21-migrated")
+  (unless (or (file-exists? ".gpg-v21-migrated") (file-exists? "gpg-v21-migrated"))
 	  (error "Not migrated"))
 
   (for-each
diff --git a/tests/migrations/run-tests.scm b/tests/migrations/run-tests.scm
index f44334c..d4db14f 100644
--- a/tests/migrations/run-tests.scm
+++ b/tests/migrations/run-tests.scm
@@ -23,5 +23,6 @@
 	       (load-tests "tests" "migrations")
 	       (map (lambda (name)
 		      (test::scm #f
+			         #f
 				 (path-join "tests" "migrations" name)
 				 (in-srcdir "tests" "migrations" name))) tests)))
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 58e1c2a..7998d2a 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -47,6 +47,7 @@ XTESTS = \
 	enarmor.scm \
 	mds.scm \
 	decrypt.scm \
+	decrypt-sym.scm \
 	decrypt-multifile.scm \
 	decrypt-dsa.scm \
 	decrypt-session-key.scm \
@@ -209,7 +210,9 @@ priv_keys = privkeys/50B2D4FA4122C212611048BC5FC31BD44393626E.asc \
             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 \
@@ -228,6 +231,7 @@ sample_keys = samplekeys/README \
 	      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 \
@@ -240,6 +244,10 @@ sample_keys = samplekeys/README \
 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 \
diff --git a/tests/openpgp/Makefile.in b/tests/openpgp/Makefile.in
index dc587e0..aaae970 100644
--- a/tests/openpgp/Makefile.in
+++ b/tests/openpgp/Makefile.in
@@ -433,16 +433,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/common -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)
-@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
@@ -466,6 +456,7 @@ XTESTS = \
 	enarmor.scm \
 	mds.scm \
 	decrypt.scm \
+	decrypt-sym.scm \
 	decrypt-multifile.scm \
 	decrypt-dsa.scm \
 	decrypt-session-key.scm \
@@ -613,7 +604,9 @@ priv_keys = privkeys/50B2D4FA4122C212611048BC5FC31BD44393626E.asc \
             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 \
@@ -632,6 +625,7 @@ sample_keys = samplekeys/README \
 	      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 \
@@ -644,6 +638,10 @@ sample_keys = samplekeys/README \
 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 \
diff --git a/tests/openpgp/README b/tests/openpgp/README
index 63f1886..1225d4a 100644
--- a/tests/openpgp/README
+++ b/tests/openpgp/README
@@ -218,8 +218,8 @@ There is one source function, tr:open.  To describe a transformation
 using some process, use tr:spawn, tr:gpg, or tr:pipe-do.  There are
 several sinks, although sink is not quite the right term, because the
 data is not consumed, and hence one can use them at any position.  The
-"sinks" are tr:write-to, tr:call-with-content, tr:assert-identity, and
-tr:assert-weak-identity.
+"sinks" are tr:write-to, tr:call-with-content, tr:assert-identity,
+tr:assert-weak-identity, and tr:assert-same.
 
 A somewhat contrived example demonstrating many functions is:
 
diff --git a/tests/openpgp/all-tests.scm b/tests/openpgp/all-tests.scm
index 98a8a65..e40e02d 100644
--- a/tests/openpgp/all-tests.scm
+++ b/tests/openpgp/all-tests.scm
@@ -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))))
 
@@ -62,7 +64,8 @@
  (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*
@@ -73,17 +76,16 @@
 	      (if keyboxd-enabled?
 		  (map (lambda (name)
 			 (test::scm setup-use-keyboxd
-				    (qualify (path-join "tests" "openpgp" name)
-					     "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)
diff --git a/tests/openpgp/decrypt-sym.scm b/tests/openpgp/decrypt-sym.scm
new file mode 100644
index 0000000..7af88ea
--- /dev/null
+++ b/tests/openpgp/decrypt-sym.scm
@@ -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"))
diff --git a/tests/openpgp/defs.scm b/tests/openpgp/defs.scm
index 6795512..bf3714f 100644
--- a/tests/openpgp/defs.scm
+++ b/tests/openpgp/defs.scm
@@ -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
diff --git a/tests/openpgp/encrypt.scm b/tests/openpgp/encrypt.scm
index f59a1f0..ef2f7b0 100755
--- a/tests/openpgp/encrypt.scm
+++ b/tests/openpgp/encrypt.scm
@@ -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"))
diff --git a/tests/openpgp/fake-pinentry.c b/tests/openpgp/fake-pinentry.c
index fb0c6ae..18b6057 100644
--- a/tests/openpgp/fake-pinentry.c
+++ b/tests/openpgp/fake-pinentry.c
@@ -196,28 +196,20 @@ option_value (const char *line, const char *name)
   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 @@ main (int argc, char **argv)
       if (! log_stream)
         {
           perror (logfile);
-          return 1;
+          return -1;
         }
     }
 
@@ -251,20 +243,31 @@ main (int argc, char **argv)
         {
           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 @@ main (int argc, char **argv)
 #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 @@ main (int argc, char **argv)
 	}
       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 @@ main (int argc, char **argv)
   if (log_stream)
     fclose (log_stream);
 
-  free (option_user_data);
+  if (passphrase)
+    free (passphrase);
   return 0;
 }
diff --git a/tests/openpgp/issue2941.scm b/tests/openpgp/issue2941.scm
index 8f625eb..306df6c 100755
--- a/tests/openpgp/issue2941.scm
+++ b/tests/openpgp/issue2941.scm
@@ -29,6 +29,6 @@
 (for-each-p
  "Checking invocation with invalid file descriptors (issue2941)."
  (lambda (option)
-   (check-failure `(,(string-append "--" option "=23") --sign gpg.conf)))
+   (check-failure `(,(string-append "--" option "=233") --sign gpg.conf)))
  '("status-fd" "attribute-fd" "logger-fd"
    "override-session-key-fd" "passphrase-fd" "command-fd"))
diff --git a/tests/openpgp/privkeys/891067FFFC6D67D37BD4BFC399191C5F3989D1B5.key b/tests/openpgp/privkeys/891067FFFC6D67D37BD4BFC399191C5F3989D1B5.key
new file mode 100644
index 0000000..3e805d4
--- /dev/null
+++ b/tests/openpgp/privkeys/891067FFFC6D67D37BD4BFC399191C5F3989D1B5.key
@@ -0,0 +1,5 @@
+Created: 20220916T120000
+Key: (private-key (ecc (curve Curve25519)(flags djb-tweak)(q
+  #409651F6DD19C8F562792274BCE044F8916609FBDA25EE3DFA21207DCE8CBA0C63#)
+ (d #778955D781825551C8B8025DF6A9D7A00613331DE35711F56C65676A98E565F8#)
+ ))
diff --git a/tests/openpgp/privkeys/F27FC04CB01723A4CB6F5399F7B86CCD82C0169C.key b/tests/openpgp/privkeys/F27FC04CB01723A4CB6F5399F7B86CCD82C0169C.key
new file mode 100644
index 0000000..5446438
--- /dev/null
+++ b/tests/openpgp/privkeys/F27FC04CB01723A4CB6F5399F7B86CCD82C0169C.key
@@ -0,0 +1,5 @@
+Created: 20220916T120000
+Key: (private-key (ecc (curve Ed25519)(flags eddsa)(q
+  #403905D615CA9A98D674F1CC7AA8B5E9F948D7D2FB2E7536ED6027B014B1F948E6#)
+ (d #F1E5A1387736A9BD0976AA1FA1D217C3A75EC636605EA8EEAF3C84A9C13E01B4#)
+ ))
diff --git a/tests/openpgp/run-tests.scm b/tests/openpgp/run-tests.scm
index 8f94359..faf52d8 100644
--- a/tests/openpgp/run-tests.scm
+++ b/tests/openpgp/run-tests.scm
@@ -29,6 +29,7 @@
 (define setup
   (make-environment-cache (test::scm
 			   #f
+			   #f
 			   (path-join "tests" "openpgp" "setup.scm")
 			   (in-srcdir "tests" "openpgp" "setup.scm"))))
 
@@ -55,11 +56,12 @@
                (if use-keyboxd?
 	           (map (lambda (name)
 		          (test::scm setup-use-keyboxd
-				     (qualify (path-join "tests" "openpgp" name)
-					      "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))))
diff --git a/tests/openpgp/samplekeys/README b/tests/openpgp/samplekeys/README
index 74635c7..682dfc0 100644
--- a/tests/openpgp/samplekeys/README
+++ b/tests/openpgp/samplekeys/README
@@ -17,6 +17,7 @@ E657FB607BB4F21C90BB6651BC067AF28BC90111.asc Key with subkeys (no protection)
 pgp-desktop-skr.asc    Secret key with subkeys w/o signatures
 rsa-rsa-sample-1.asc   RSA+RSA sample key (no passphrase)
 ed25519-cv25519-sample-1.asc  Ed25519+CV25519 sample key (no passphrase)
+ed25519-cv25519-sample-2.asc  Ed25519+CV25519 sample key (no passphrase)
 silent-running.asc     Collection of sample secret keys (no passphrases)
 rsa-primary-auth-only.pub.asc  rsa2408 primary only, usage: cert,auth
 rsa-primary-auth-only.sec.asc  Ditto but the secret keyblock.
diff --git a/tests/openpgp/samplekeys/ed25519-cv25519-sample-1.asc b/tests/openpgp/samplekeys/ed25519-cv25519-sample-1.asc
index 54d2044..53e2440 100644
--- a/tests/openpgp/samplekeys/ed25519-cv25519-sample-1.asc
+++ b/tests/openpgp/samplekeys/ed25519-cv25519-sample-1.asc
@@ -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-----
diff --git a/tests/openpgp/samplekeys/ed25519-cv25519-sample-2.asc b/tests/openpgp/samplekeys/ed25519-cv25519-sample-2.asc
new file mode 100644
index 0000000..2e72851
--- /dev/null
+++ b/tests/openpgp/samplekeys/ed25519-cv25519-sample-2.asc
@@ -0,0 +1,21 @@
+pub   ed25519 2022-09-16 [SC]
+      5F1438D784C8C68400645518AE08687BF38AFFF3
+      Keygrip = F27FC04CB01723A4CB6F5399F7B86CCD82C0169C
+uid                      mahsa.amini@example.net
+sub   cv25519 2022-09-16 [E]
+      FFE7440568492D986F3B88BD9E64CB003A8D6449
+      Keygrip = 891067FFFC6D67D37BD4BFC399191C5F3989D1B5
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEYyRlQBYJKwYBBAHaRw8BAQdAOQXWFcqamNZ08cx6qLXp+UjX0vsudTbtYCew
+FLH5SOa0F21haHNhLmFtaW5pQGV4YW1wbGUubmV0iJMEExYKADsWIQRfFDjXhMjG
+hABkVRiuCGh784r/8wUCYyRlQAIbAwULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIX
+gAAKCRCuCGh784r/8wYzAQDTikkZd/G/o1DtfGq/k0R9ctcZCD9vHKH3PNj2atfX
+cwEAt5zFYyEe2OPzJ5HYffOPhcyK2kPsvkerLfdXy/K8QAe4OARjJGVAEgorBgEE
+AZdVAQUBAQdAllH23RnI9WJ5InS84ET4kWYJ+9ol7j36ISB9zoy6DGMDAQgHiHgE
+GBYKACAWIQRfFDjXhMjGhABkVRiuCGh784r/8wUCYyRlQAIbDAAKCRCuCGh784r/
+89lTAQDpupXGKLSlga2qHgtaud47oU5edY48MZ7CBnFByi5IAQEA2nJpUsVuaQl2
+XSURaPTUi0C98ny61kwGcVtOcTFpPgY=
+=r11D
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/tests/openpgp/samplemsgs/enc-sym-cfb-1.asc b/tests/openpgp/samplemsgs/enc-sym-cfb-1.asc
new file mode 100644
index 0000000..24415c9
--- /dev/null
+++ b/tests/openpgp/samplemsgs/enc-sym-cfb-1.asc
@@ -0,0 +1,9 @@
+Symmetric encrypted message of "Hello, world!\n" using
+the passphrase "password" and cipher AES128.CFB.
+
+-----BEGIN PGP MESSAGE-----
+
+jA0EBwMCt0tGQ7H0b2Xt0j8BHVEh+mzI3SyApdQmObZuDtAKNk/dRbERyF7haRCn
+cw3N5t3hbOZ/fWlN/BRAaKplninV//QEo8lqheFFpmI=
+=LxrG
+-----END PGP MESSAGE-----
diff --git a/tests/openpgp/samplemsgs/enc-sym-cfb-2.asc b/tests/openpgp/samplemsgs/enc-sym-cfb-2.asc
new file mode 100644
index 0000000..391b31d
--- /dev/null
+++ b/tests/openpgp/samplemsgs/enc-sym-cfb-2.asc
@@ -0,0 +1,9 @@
+Symmetric encrypted message of "Hello, world!\n" using
+the passphrase "password" and cipher AES256.CFB.
+
+-----BEGIN PGP MESSAGE-----
+
+jA0ECQMCN4BmCgZpVHDt0j8B1MRJ3ezrbVqU3Xofj5ykOmb7dgYytxzk6QHqzdNO
+lorumncKV+xjFkte8uKqaGJoPhoKb2s9uJWDgugLMDM=
+=gy0I
+-----END PGP MESSAGE-----
diff --git a/tests/openpgp/samplemsgs/enc-sym-ocb-1.asc b/tests/openpgp/samplemsgs/enc-sym-ocb-1.asc
new file mode 100644
index 0000000..783cc9d
--- /dev/null
+++ b/tests/openpgp/samplemsgs/enc-sym-ocb-1.asc
@@ -0,0 +1,11 @@
+Symmetric encrypted message of "Hello, world!\n" using
+the passphrase "password" and cipher AES128.OCB.
+This is the sample message from the rfc4880bis specs.
+
+-----BEGIN PGP MESSAGE-----
+
+wz0FBwIDCJ8LfaPl6mR3kJnjJuVACpCTbO+06OugjGdzcW0fJxRUCjj8rFKZSdrF
+KdPeMeFbSutynjMAM9vt1EkBBwIOXtK8HkcKvo8dZEx6bIpWew93ARlmEaFUupwl
+dM0FYoSo72gDXGI9k8xwikMhG7bq8rJ/fBjVcbzYOyCt06CLc68VuaCY
+=xyh5
+-----END PGP MESSAGE-----
diff --git a/tests/openpgp/samplemsgs/enc-sym-ocb-2.asc b/tests/openpgp/samplemsgs/enc-sym-ocb-2.asc
new file mode 100644
index 0000000..a1738e8
--- /dev/null
+++ b/tests/openpgp/samplemsgs/enc-sym-ocb-2.asc
@@ -0,0 +1,11 @@
+Symmetric encrypted message of "Hello, world!\n" using
+the passphrase "password" and cipher AES256.OCB.
+
+-----BEGIN PGP MESSAGE-----
+
+jE0FCQIDAvYE/YfWbrWF7T3TKFmFzU/o5JSmot/OwIoDZc4sABYLMuTjVeCXUaRp
+unDEDnkCz0tsov+7ljb/tu2NUDGnybSsupE+E4bMf9RJAQkCEMhe3HeHBrv1jHsS
+gbmxjSQ/r1whc40/vh6ACbp/Yu2Te1Gf/mPxS9mgLDbIeah3G9/kXlheO4X2Hhuy
+iOCOZdpPiAp1QA==
+=U8eG
+-----END PGP MESSAGE-----
diff --git a/tests/openpgp/shell.scm b/tests/openpgp/shell.scm
index 347b3a0..af4f254 100644
--- a/tests/openpgp/shell.scm
+++ b/tests/openpgp/shell.scm
@@ -47,7 +47,9 @@
 			(pathsep-split (getenv "PATH"))))
 	#t)
 
-(echo "\nEnjoy your test environment. "
+(if (prompt-yes-no? "Run system shell" #t)
+    ((echo "\nEnjoy your test environment. "
       "Type 'exit' to exit it, it will be cleaned up after you.\n")
-
-(interactive-shell)
+     (interactive-shell))
+    ((echo "\nEnjoy the REPL.")
+     (interactive-repl (current-environment))))
diff --git a/tests/pkits/Makefile.am b/tests/pkits/Makefile.am
index 0b90f86..d25dd91 100644
--- a/tests/pkits/Makefile.am
+++ b/tests/pkits/Makefile.am
@@ -23,7 +23,7 @@ GPGSM = ../../sm/gpgsm
 TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \
                     GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
 		    GNUPG_IN_TEST_SUITE=fact \
-                    GPGSM=$(GPGSM) silent=yes
+                    GPGSM=$(GPGSM)$(EXEEXT) silent=yes
 
 
 testscripts = import-all-certs validate-all-certs \
diff --git a/tests/pkits/Makefile.in b/tests/pkits/Makefile.in
index 11f4ff6..ef5fbeb 100644
--- a/tests/pkits/Makefile.in
+++ b/tests/pkits/Makefile.in
@@ -367,7 +367,7 @@ GPGSM = ../../sm/gpgsm
 TESTS_ENVIRONMENT = GNUPGHOME=`/bin/pwd` GPG_AGENT_INFO= LC_ALL=C \
                     GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
 		    GNUPG_IN_TEST_SUITE=fact \
-                    GPGSM=$(GPGSM) silent=yes
+                    GPGSM=$(GPGSM)$(EXEEXT) silent=yes
 
 testscripts = import-all-certs validate-all-certs \
 	signature-verification        \
diff --git a/tests/tpm2dtests/Makefile.in b/tests/tpm2dtests/Makefile.in
index c676914..8b27d90 100644
--- a/tests/tpm2dtests/Makefile.in
+++ b/tests/tpm2dtests/Makefile.in
@@ -391,16 +391,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/common -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)
-@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
diff --git a/tools/Makefile.am b/tools/Makefile.am
index a3fe6e3..39374e4 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -98,7 +98,7 @@ 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)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 7c8be74..7dead7f 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -654,16 +654,6 @@ 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)
-@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
@@ -698,7 +688,7 @@ gpgconf_LDADD = $(common_libs) \
 	        $(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
diff --git a/tools/gpg-card.c b/tools/gpg-card.c
index d851f99..a94aabe 100644
--- a/tools/gpg-card.c
+++ b/tools/gpg-card.c
@@ -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,6 +39,7 @@
 #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"
@@ -789,7 +790,10 @@ list_one_kinfo (card_info_t info, key_info_t kinfo,
                 }
               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
@@ -1239,7 +1243,7 @@ cmd_list (card_info_t info, char *argstr)
 
   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);
@@ -2736,7 +2740,7 @@ cmd_passwd (card_info_t info, char *argstr)
        "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)
@@ -2935,7 +2939,7 @@ cmd_passwd (card_info_t info, char *argstr)
       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");
 
@@ -3631,6 +3635,60 @@ cmd_apdu (card_info_t info, char *argstr)
 
 
 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
+      ("GPG[SM] <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; argarray[i]; i++)
+    ccparray_put (&ccp, argarray[i]);
+  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;
@@ -3667,7 +3725,7 @@ enum cmdids
     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
   };
 
@@ -3708,6 +3766,8 @@ static struct
   { "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 }
@@ -3838,6 +3898,8 @@ dispatch_command (card_info_t info, const char *orig_command)
     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:
@@ -4095,6 +4157,8 @@ interactive_loop (void)
         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:
diff --git a/tools/gpg-wks-client.c b/tools/gpg-wks-client.c
index f77df88..c603cc0 100644
--- a/tools/gpg-wks-client.c
+++ b/tools/gpg-wks-client.c
@@ -76,6 +76,7 @@ enum cmd_and_opt_values
     oWithColons,
     oBlacklist,
     oNoAutostart,
+    oAddRevocs,
 
     oDummy
   };
@@ -102,9 +103,9 @@ static gpgrt_opt_t opts[] = {
   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 ")),
 
@@ -119,6 +120,7 @@ static gpgrt_opt_t opts[] = {
   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_s (oFakeSubmissionAddr, "fake-submission-addr", "@"),
 
@@ -257,6 +259,9 @@ parse_arguments (gpgrt_argparse_t *pargs, gpgrt_opt_t *popts)
         case oBlacklist:
           add_blacklist (pargs->r.ret_str);
           break;
+        case oAddRevocs:
+          opt.add_revocs = 1;
+          break;
 
 	case aSupported:
 	case aCreate:
@@ -1110,6 +1115,9 @@ command_check (char *userid)
           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)
@@ -1148,6 +1156,7 @@ command_send (const char *fingerprint, const char *userid)
   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)
@@ -1164,7 +1173,7 @@ command_send (const char *fingerprint, const char *userid)
       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;
 
@@ -1208,12 +1217,20 @@ command_send (const char *fingerprint, const char *userid)
     }
   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;
@@ -1222,6 +1239,14 @@ command_send (const char *fingerprint, const char *userid)
     }
   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);
 
@@ -1232,7 +1257,7 @@ command_send (const char *fingerprint, const char *userid)
       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));
@@ -1257,11 +1282,47 @@ command_send (const char *fingerprint, const char *userid)
        * 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
@@ -1306,7 +1367,7 @@ command_send (const char *fingerprint, const char *userid)
   if (no_encrypt)
     {
       void *data;
-      size_t datalen, n;
+      size_t datalen;
 
       if (posteo_hack)
         {
@@ -1331,16 +1392,7 @@ command_send (const char *fingerprint, const char *userid)
           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;
@@ -1827,7 +1879,7 @@ domain_matches_mbox (const char *domain, const char *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 newwest one.  This is
+ * 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>
@@ -1868,24 +1920,36 @@ mirror_one_keys_userid (estream_t key, const char *mbox, uidinfo_list_t uidlist,
       err = gpg_error (GPG_ERR_NO_USER_ID);
       goto leave;
     }
-  /* FIXME: Consult blacklist.  */
-
 
-  /* Only if we have more than one user id we bother to run the
-   * filter.  In this case the result will be put into NEWKEY*/
+  /* Always filter the key so that the result will be non-armored.  */
   es_rewind (key);
-  if (uidlist->next)
+  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)
     {
-      err = wks_filter_uid (&newkey, key, thisuid->uid, 0);
+      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 filtering key %s: %s\n", fpr, gpg_strerror (err));
-          err = gpg_error (GPG_ERR_NO_PUBKEY);
+          log_error ("error finding revocations for '%s': %s\n",
+                     mbox, gpg_strerror (err));
           goto leave;
         }
+      es_rewind (newkey);
     }
 
-  err = wks_install_key_core (newkey? newkey : key, mbox);
+  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++;
@@ -1924,6 +1988,8 @@ mirror_one_key (estream_t key)
     {
       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))
diff --git a/tools/gpg-wks.h b/tools/gpg-wks.h
index 32aa8c3..a7c17ca 100644
--- a/tools/gpg-wks.h
+++ b/tools/gpg-wks.h
@@ -39,6 +39,7 @@ struct
   int use_sendmail;
   int with_colons;
   int no_autostart;
+  int add_revocs;
   const char *output;
   const char *gpg_program;
   const char *directory;
@@ -80,6 +81,8 @@ struct uidinfo_list_s
   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 uid[1];
 };
 typedef struct uidinfo_list_s *uidinfo_list_t;
@@ -91,11 +94,14 @@ void wks_set_status_fd (int fd);
 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);
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 7cd45c7..90f2f53 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -1370,7 +1370,7 @@ gc_component_check_options (int component, estream_t out, const char *conf_file)
 
   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 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed)
   /* First we need to read the option table from the program.  */
   argv[0] = "--dump-option-table";
   argv[1] = 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 @@ retrieve_options_from_program (gc_component_id_t component, int only_installed)
   /* Now read the default options.  */
   argv[0] = "--gpgconf-list";
   argv[1] = NULL;
-  err = gnupg_spawn_process (pgmname, argv, NULL, NULL, 0,
+  err = gnupg_spawn_process (pgmname, argv, NULL, 0,
                              NULL, &outfp, NULL, &pid);
   if (err)
     {
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index 83ad947..4afc4e9 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -1182,7 +1182,7 @@ show_versions_via_dirmngr (estream_t fp)
   pgmname = gnupg_module_name (GNUPG_MODULE_NAME_DIRMNGR);
   argv[0] = "--gpgconf-versions";
   argv[1] = NULL;
-  err = gnupg_spawn_process (pgmname, argv, NULL, NULL, 0,
+  err = gnupg_spawn_process (pgmname, argv, NULL, 0,
                              NULL, &outfp, NULL, &pid);
   if (err)
     {
diff --git a/tools/gpgtar-create.c b/tools/gpgtar-create.c
index 63d0e83..3a7687d 100644
--- a/tools/gpgtar-create.c
+++ b/tools/gpgtar-create.c
@@ -1195,7 +1195,7 @@ gpgtar_create (char **inpattern, const char *files_from, int null_names,
           goto leave;
         }
 
-      err = gnupg_spawn_process (opt.gpg_program, argv, NULL, NULL,
+      err = gnupg_spawn_process (opt.gpg_program, argv, NULL,
                                  (GNUPG_SPAWN_KEEP_STDOUT
                                   | GNUPG_SPAWN_KEEP_STDERR),
                                  &outstream, NULL, NULL, &pid);
diff --git a/tools/gpgtar-extract.c b/tools/gpgtar-extract.c
index 832039b..f96887f 100644
--- a/tools/gpgtar-extract.c
+++ b/tools/gpgtar-extract.c
@@ -408,7 +408,7 @@ gpgtar_extract (const char *filename, int decrypt)
           goto leave;
         }
 
-      err = gnupg_spawn_process (opt.gpg_program, argv, NULL, NULL,
+      err = gnupg_spawn_process (opt.gpg_program, argv, NULL,
                                  ((filename? 0 : GNUPG_SPAWN_KEEP_STDIN)
                                   | GNUPG_SPAWN_KEEP_STDERR),
                                  NULL, &stream, NULL, &pid);
diff --git a/tools/gpgtar-list.c b/tools/gpgtar-list.c
index 08ab967..a536b05 100644
--- a/tools/gpgtar-list.c
+++ b/tools/gpgtar-list.c
@@ -501,7 +501,7 @@ gpgtar_list (const char *filename, int decrypt)
           goto leave;
         }
 
-      err = gnupg_spawn_process (opt.gpg_program, argv, NULL, NULL,
+      err = gnupg_spawn_process (opt.gpg_program, argv, NULL,
                                  ((filename? 0 : GNUPG_SPAWN_KEEP_STDIN)
                                   | GNUPG_SPAWN_KEEP_STDERR),
                                  NULL, &stream, NULL, &pid);
diff --git a/tools/wks-util.c b/tools/wks-util.c
index a1640d7..6caa4ee 100644
--- a/tools/wks-util.c
+++ b/tools/wks-util.c
@@ -101,7 +101,8 @@ wks_write_status (int no, const char *format, ...)
  * 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;
@@ -121,6 +122,8 @@ append_to_uidinfo_list (uidinfo_list_t *list, const char *uid, time_t created)
   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;
@@ -150,6 +153,21 @@ free_uidinfo_list (uidinfo_list_t list)
 }
 
 
+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; argv[i]; i++)
+    log_printf (" '%s'", argv[i]);
+  log_printf ("\n");
+}
+
+
 
 struct get_key_status_parm_s
 {
@@ -164,7 +182,8 @@ get_key_status_cb (void *opaque, const char *keyword, char *args)
 {
   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++;
@@ -177,10 +196,11 @@ get_key_status_cb (void *opaque, const char *keyword, char *args)
  * 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;
@@ -202,8 +222,9 @@ wks_get_key (estream_t *r_key, const char *fingerprint, const char *addrspec,
     }
 
   /* 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)
@@ -223,7 +244,8 @@ wks_get_key (estream_t *r_key, const char *fingerprint, const char *addrspec,
   ccparray_put (&ccp, "--batch");
   ccparray_put (&ccp, "--status-fd=2");
   ccparray_put (&ccp, "--always-trust");
-  ccparray_put (&ccp, "--armor");
+  if (!binary)
+    ccparray_put (&ccp, "--armor");
   ccparray_put (&ccp, "--export-options=export-minimal");
   ccparray_put (&ccp, "--export-filter");
   ccparray_put (&ccp, filterexp);
@@ -239,6 +261,7 @@ wks_get_key (estream_t *r_key, const char *fingerprint, const char *addrspec,
       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);
@@ -276,6 +299,22 @@ key_status_cb (void *opaque, const char *keyword, char *args)
 }
 
 
+/* 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.
@@ -296,6 +335,7 @@ wks_list_key (estream_t key, char **r_fpr, uidinfo_list_t *r_mboxes)
   int lnr;
   char *fpr = NULL;
   uidinfo_list_t mboxes = NULL;
+  int expired, revoked;
 
   if (r_fpr)
     *r_fpr = NULL;
@@ -332,6 +372,7 @@ wks_list_key (estream_t key, char **r_fpr, uidinfo_list_t *r_mboxes)
       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);
@@ -343,6 +384,7 @@ wks_list_key (estream_t key, char **r_fpr, uidinfo_list_t *r_mboxes)
 
   es_rewind (listing);
   lnr = 0;
+  expired = revoked = 0;
   maxlen = 2048; /* Set limit.  */
   while ((len = es_read_line (listing, &line, &length_of_line, &maxlen)) > 0)
     {
@@ -387,12 +429,20 @@ wks_list_key (estream_t key, char **r_fpr, uidinfo_list_t *r_mboxes)
           err = gpg_error (GPG_ERR_INV_ENGINE);
           goto leave;
         }
-      if (lnr > 1 && !strcmp (fields[0], "pub"))
+      if (!strcmp (fields[0], "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 (fields[1], &expired, &revoked);
+          else
+            expired = revoked = 0;
         }
+
       if (!strcmp (fields[0], "sub") || !strcmp (fields[0], "ssb"))
         break; /* We can stop parsing here.  */
 
@@ -407,8 +457,13 @@ wks_list_key (estream_t key, char **r_fpr, uidinfo_list_t *r_mboxes)
         }
       else if (!strcmp (fields[0], "uid") && nfields > 9)
         {
+          int uidexpired, uidrevoked;
+
+          set_expired_revoked (fields[1], &uidexpired, &uidrevoked);
           if (!append_to_uidinfo_list (&mboxes, fields[9],
-                                       parse_timestamp (fields[5], NULL)))
+                                       parse_timestamp (fields[5], NULL),
+                                       expired || uidexpired,
+                                       revoked || uidrevoked))
             {
               err = gpg_error_from_syserror ();
               goto leave;
@@ -510,6 +565,7 @@ wks_filter_uid (estream_t *r_newkey, estream_t key, const char *uid,
       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);
@@ -531,6 +587,124 @@ wks_filter_uid (estream_t *r_newkey, estream_t key, const char *uid,
 }
 
 
+/* 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 buffer[4096];
+  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)
@@ -1102,7 +1276,7 @@ wks_cmd_install_key (const char *fname, const char *userid)
     {
       /* 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",
@@ -1139,6 +1313,12 @@ wks_cmd_install_key (const char *fname, const char *userid)
         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)
         {
@@ -1174,6 +1354,24 @@ wks_cmd_install_key (const char *fname, const char *userid)
     fp = fp2;
   }
 
+  if (opt.add_revocs)
+    {
+      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);
+    }
+
   err = wks_install_key_core (fp, addrspec);
   if (!opt.quiet)
     log_info ("key %s published for '%s'\n", fpr, addrspec);
diff --git a/tpm2d/Makefile.in b/tpm2d/Makefile.in
index c91f939..172ef9b 100644
--- a/tpm2d/Makefile.in
+++ b/tpm2d/Makefile.in
@@ -434,16 +434,6 @@ 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)
-@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