Imported Upstream version 2.3.7upstream/2.3.7

147 files changed, 26440 insertions, 24564 deletions

diff --git a/ChangeLog b/ChangeLog
index 1132774..204b507 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,547 @@
+2022-07-11  Werner Koch  <wk@gnupg.org>
+
+	Release 2.3.7.
+	+ commit bc5328f5119aa6f6233c4387660f163b77bb9ce1
+
+
+2022-07-05  NIIBE Yutaka  <gniibe@fsij.org>
+
+	gpg,build: Fix message for newer gettext.
+	+ commit 424aa3543de0c832f4b7da5f6d116616b09924ee
+	* g10/keyserver.c (keyserver_refresh): Use ngettext.
+
+2022-06-29  Werner Koch  <wk@gnupg.org>
+
+	gpgconf: New short options -V and -X.
+	+ commit 15a8834b0b4a7261a89238143421e56f1a335e8a
+	* tools/gpgconf.c: Assign short options -X and -V
+	(show_version_gnupg): Print the vsd version if available.
+
+2022-06-28  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent: Don't assume "OPENPGP.3" key means "Use-for-ssh:".
+	+ commit 39422f1d63e2d9691d8fe4bfceb0d1e43cd914bd
+	* agent/command-ssh.c: Fix comments.
+	* agent/findkey.c (public_key_from_file): Remove "OPENPGP.3" check.
+
+2022-06-27  Werner Koch  <wk@gnupg.org>
+
+	agent: Do not consider --min-passphrase-len for the magic wand.
+	+ commit ae2f1f0785e429d6dbb577a1fcf9a880aaff8e49
+	* agent/call-pinentry.c (generate_pin): Lock to exactly 30 octets.
+	* g10/gpg.c (main) <aGenRandom>: Add Level 30.
+
+2022-06-23  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent: Flush before calling ftruncate.
+	+ commit 99d2931887e5ba0db9007024b3420b110603d5be
+	* agent/findkey.c (write_extended_private_key): Make sure
+	it is flushed out.
+
+	agent: KEYATTR only allows access to attribute.
+	+ commit 26d5a6e862c68bf7355ade48e036732fb52561e9
+	* agent/command.c (cmd_keyattr): Check the ATTRNAME.
+
+	agent: Fix KEYATTR command for --delete option.
+	+ commit 2c47c6662793ad2220a97e8aff1acb0aca4099bf
+	* agent/command.c (cmd_keyattr): Write the result.
+
+2022-06-22  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent: Add KEYATTR command.
+	+ commit 30b54a0ebbaa8ac491710ad1b4f2fbd1b5814bce
+	* agent/agent.h (agent_raw_key_from_file): Add R_KEYMETA argument.
+	(agent_update_private_key): New.
+	* agent/command-ssh.c (data_sign): Follow the change of the function
+	agent_raw_key_from_file.
+	* agent/command.c (do_one_keyinfo): Likewise.
+	(cmd_keyattr): New.
+	(register_commands): Add an entry of cmd_keyattr.
+	* agent/findkey.c (agent_update_private_key): New.
+	(agent_raw_key_from_file): Add R_KEYMETA argument.
+
+	agent,gpg,tools: Fix use of log_get_fd.
+	+ commit fe535cf26592d6af53d5aea15b3fdc1d79ba0f80
+	* agent/call-daemon.c (daemon_start): Don't put file descriptor from
+	log_get_fd to no_close_list.
+	* agent/call-pinentry.c (start_pinentry): Likewise.
+	* common/call-gpg.c (start_gpg): Likewise.
+	* call-syshelp.c (start_syshelp): Likewise.
+	* tools/gpg-connect-agent.c (main): Likewise.
+
+2022-06-20  Werner Koch  <wk@gnupg.org>
+
+	sm: Improve pkcs#12 debug output.
+	+ commit 52f9e13c0cb3b42c469e2d00352ab36948ca1e55
+	* sm/minip12.c (parse_shrouded_key_bag): Fix offset diagnostic.
+	(parse_cert_bag): Ditto.
+	(parse_bag_data): Remove debug output.  Pass startoffset.  Fix offset
+	diagnostic.
+
+	sm: Rework the PKCS#12 parser to support DFN issued keys.
+	+ commit a4e04375e84ecb7ea0d02e153cb27988fca4c2d0
+	* sm/minip12.c (struct p12_parse_ctx_s): New.  Use this instead of
+	passing several parameters to most functions.
+	(parse_pag_data): Factor things out to  ...
+	parse_shrouded_key_bag): new.
+	(parse_cert_bag): New.
+	(parse_bag_data): New.
+	(p12_parse): Setup the parse context.
+
+2022-06-17  Werner Koch  <wk@gnupg.org>
+
+	agent: Improve "Insert the card" message.
+	+ commit be5d06dae23972a503e6eed555b3a254151be366
+	* agent/findkey.c (prompt_for_card): Don't print "(null").
+
+2022-06-15  Werner Koch  <wk@gnupg.org>
+
+	agent,ssh: Fix for make not-inserted OpenPGP.3 keys available for SSH.
+	+ commit 2766b9e56c778d3cbed93aeec5821363a4277c52
+	* agent/command-ssh.c (ssh_send_available_keys):  Do not bump
+	key_counter for ignored keys.  Also use opt.debug instead of
+	opt.verbose and fix a memory leak.
+
+2022-06-14  Werner Koch  <wk@gnupg.org>
+
+	agent: New option --no-user-trustlist and --sys-trustlist-name.
+	+ commit 1530d04725d475bf29328eab40b42f72ff8aa06b
+	* agent/gpg-agent.c (oNoUserTrustlist,oSysTrustlistName): New.
+	(opts): Add new option names.
+	(parse_rereadable_options): Parse options.
+	(finalize_rereadable_options): Reset allow-mark-trusted for the new
+	option.
+	* agent/agent.h (opt): Add fields no_user_trustlist and
+	sys_trustlist_name.
+	* agent/trustlist.c (make_sys_trustlist_name): New.
+	(read_one_trustfile): Use here.
+	(read_trustfiles): Use here.  Implement --no-user-trustlist.
+
+	g10: Fix garbled status messages in NOTATION_DATA.
+	+ commit 34c649b3601383cd11dbc76221747ec16fd68e1b
+	* g10/cpr.c (write_status_text_and_buffer): Fix off-by-one
+
+2022-06-14  Jakub Jelen  <jjelen@redhat.com>
+
+	keygen: Fix reading AEAD preference.
+	+ commit 4dbef2addca8c76fb4953fd507bd800d2a19d3ec
+	* g10/keygen.c (keygen_set_std_prefs): Use the right variable when
+	  reading AEAD preference string
+
+2022-06-13  Werner Koch  <wk@gnupg.org>
+
+	gpgsm: New option --compatibility-flags.
+	+ commit f0b373cec93bb01f02b9c0a3ab1f3e242b381c3f
+	* sm/gpgsm.c (oCompatibilityFlags): New option.
+	(compatibility_flags): new.
+	(main): Parse and print them in verbose mode.
+	* sm/gpgsm.h (opt): Add field compat_glags.:
+	(COMPAT_ALLOW_KA_TO_ENCR): New.
+	* sm/keylist.c (print_capabilities): Take care of the new flag.
+	* sm/certlist.c (cert_usage_p): Ditto.
+
+	common: New function parse_compatibility_flags.
+	+ commit ce63eaa4f8f3f41aafcaddd8d658dacd522334a8
+	* common/miscellaneous.c (parse_compatibility_flags): New.
+	* common/util.h (struct compatibility_flags_s): New.
+
+2022-06-10  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Support specifying keygrip for learn command.
+	+ commit dd600bbc84ddba56b4455cea97e048d681b083ce
+	* scd/command.c (cmd_learn): Allow keygrip argument.
+
+	scd,openpgp: Support READCERT by keygrip.
+	+ commit 273b8ec1931d3aeef530e9262b2447e94d4b350a
+	* scd/app-openpgp.c (do_readcert): Allow use of keygrip.
+
+2022-06-03  Werner Koch  <wk@gnupg.org>
+
+	common,w32: Use LoadLibraryEx to fix a warning in mingw.
+	+ commit 59c481bb86464953e526298bfe73c3466387c46d
+	* common/dynload.h (dlopen): Use LoadLibraryEx and remove Windows CE
+	support.
+
+	w32: Allow Unicode filenames for iobuf_cancel.
+	+ commit 4ee2009083cb6f279c6f8aa4397462e887d5818e
+	* common/iobuf.c (iobuf_cancel): Use gnupg_remove
+	* common/mischelp.c (same_file_p): Allow for Unicode names.
+
+2022-06-02  Werner Koch  <wk@gnupg.org>
+
+	tools: Minor fix to gpg-connect-agent options.
+	+ commit d89557fe95bf8dd92594871093814c6b0b39f4a2
+	* tools/gpg-connect-agent.c (enum cmd_and_opt_values): Move
+	oUnBuffered more to the top so that oNoop won't not get the value 'v'.
+
+2022-06-02  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent: Support --format=ssh option for READKEY.
+	+ commit d7a3c455c5e29b19b66772f86dda925064e34896
+	* agent/command.c (cmd_readkey): Handle --format=ssh to return key
+	in SSH format.
+
+	tools: Add a way to cancell INQUIRE for gpg-connect-agent.
+	+ commit 5a327e8001c4698330fabc83421277a590d5b085
+	* tools/gpg-connect-agent.c (handle_inquire): When the helper program
+	exit status is not 0, it means cancellation, now.
+
+	tools: Add --unbuffered option to gpg-connect-agent.
+	+ commit 24d02b8a32757e8c86f2a4fbca82dac4506a94d1
+	* tools/gpg-connect-agent.c (cmd_and_opt_values): Add oUnBuffered.
+	(opts, opt): Likewise.
+	(main): When unbuffered, set gpgrt_stdin/stdout accordingly.
+
+2022-06-01  Werner Koch  <wk@gnupg.org>
+
+	scd:nks: Don't flag the ESIGN keypair EF as encryption capable.
+	+ commit 3a2fb1c30633373d17880469e0b84ab2a9524585
+	* scd/app-nks.c (filelist): Tweak 0x4531.
+
+	scd:nks: Some code cleanup.
+	+ commit b92b3206e72b635fd815eaf85e7acc67c2a52ffe
+	* scd/app-nks.c (find_fid_by_keyref): Factor keyref parsing out to ...
+	(parse_keyref): new.
+	(do_readcert): Use new function instead of partly duplicated code.
+	Make detection of keygrip more robust.
+	(do_readkey): Make detection of keygrip more robust.
+	(do_with_keygrip): Use get_nks_tag.
+
+2022-05-29  Werner Koch  <wk@gnupg.org>
+
+	scd:nks: Support the Telesec ESIGN application.
+	+ commit 07eaf006c2763a6b40d2734b1c6704da466e0ed0
+	* scd/app-nks.c (find_fid_by_keyref): Disable the cache for now.
+	(readcert_from_ef): Considere an all zero certificate as not found.
+	(do_sign): Support ECC and the ESIGN application.
+
+2022-05-28  Werner Koch  <wk@gnupg.org>
+
+	gpg: Setup the 'usage' filter property for export.
+	+ commit 7aabd94b8103432b42cd909e911bf0c645e0298c
+	* g10/export.c (do_export_stream): Merge the key to get the properties
+	ready.
+
+2022-05-27  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent: New field "Prompt" to prevent asking card key insertion.
+	+ commit 9f1dcfc7a7b47ab8221e75eaa1872bbf2a72980c
+	* agent/findkey.c (prompt_for_card): Add "Prompt" field handling.
+
+2022-05-26  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent,ssh: Support "Use-for-ssh" flag in private key.
+	+ commit d86b6c28fcca50a723694bf7a11743d6fd5689cb
+	* agent/findkey.c (public_key_from_file): Support "Use-for-ssh"
+	when it's in extended format.
+
+	agent,ssh: Make not-inserted OpenPGP.3 keys available for SSH.
+	+ commit 193fcc2f7a8cca5240ce50499c54f99235a87e1c
+	* agent/agent.h (agent_ssh_key_from_file): New.
+	* agent/command-ssh.c (get_ssh_keyinfo_on_cards): New.
+	(ssh_send_available_keys): Loop on the GNUPG_PRIVATE_KEYS_DIR.
+	Support keys by agent_ssh_key_from_file.
+	(ssh_handler_request_identities): Move card key handling to
+	ssh_send_available_keys.
+	* agent/findkey.c (public_key_from_file): New.  Adding handling
+	for SSH.
+	(agent_public_key_from_file): Use public_key_from_file.
+	(agent_ssh_key_from_file): New.
+
+	agent: Fix get_keyinfo_on_cards.
+	+ commit c07c79a1d795ac8f50981637fe32383abb3e969d
+	* agent/command.c (get_keyinfo_on_cards): Make it static.  Don't
+	return bogus value on error.  Return NULL when scdaemon is disabled.
+
+	agent: Handle USAGE information in KEYINFO.
+	+ commit 295a6a7591972442a9ef4f8964baf9cdbe297cdd
+	* agent/agent.h (struct card_key_info_s): Add USAGE field.
+	* agent/call-scd.c (card_keyinfo_cb): Parse USAGE field.
+	Allow optional SERIALNO, IDSTR, and USAGE fields.
+	Fix releasing on possible allocation error.
+
+	scd: Return USAGE information for KEYINFO command.
+	+ commit 5264d3f58e8a8362900c3518bdd683ff9a23cccc
+	* scd/command.c (hlp_keyinfo): Update.
+	(send_keyinfo): Add a USAGE argument.
+	* scd/scdaemon.h (send_keyinfo): Add a USAGE argument.
+	* scd/app-nks.c (set_usage_string): New.
+	(do_learn_status_core, do_readkey): Use set_usage_string.
+	(do_with_keygrip): Add USAGE to call send_keyinfo,
+	using set_usage_string.
+	* scd/app-openpgp.c (get_usage_string): New.
+	(send_keypair_info): Use get_usage_string.
+	(send_keyinfo_if_available): Add USAGE to call send_keyinfo,
+	using get_usage_string.
+	* scd/app-p15.c (set_usage_string): New.
+	(send_keypairinfo): Use set_usage_string.
+	(do_with_keygrip): Add USAGE to call send_keyinfo,
+	using set_usage_string.
+	* scd/app-piv.c (do_with_keygrip): Add USAGE to call send_keyinfo.
+
+	scd,piv: Fix status report of KEYPAIRINFO.
+	+ commit 64c8786105687da3531608ba8440a702087475e5
+	* scd/app-piv.c (do_readkey): Use "-" for usage when not available.
+
+2022-05-25  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent,scd: Make sure to set CONFIDENTIAL flag in Assuan.
+	+ commit 052f58422dca1044aba7acb4cf57416e7a8cb01f
+	* agent/call-scd.c (inq_needpin): Call assuan_begin_confidential
+	and assuan_end_confidential, and wipe the memory after use.
+	* agent/command.c (cmd_preset_passphrase): Likewise.
+	(cmd_put_secret): Likewise.
+	* scd/command.c (pin_cb): Likewise.
+
+	agent: Add missing assuan_end_confidential call.
+	+ commit 8e859331eafc8e7cfd0f366248134531fea0d074
+	* agent/command.c (send_back_passphrase): Fix.
+
+2022-05-24  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Support automatic card selection for READCERT with keygrip.
+	+ commit ea97683d58205363d48fd41ef5559926be46681e
+	* scd/command.c (cmd_readcert): Select by KEYGRIP.
+
+2022-05-20  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent: Fix a bug accessing after release when opt.verbose.
+	+ commit 1b0c4c2778249a6fe25a2c517d9fc05a1f162f1c
+	* agent/command-ssh.c (ssh_handler_request_identities): Don't release
+	KEY_PUBLIC too early.
+
+	agent: Factor out handling scanning over ssh keys.
+	+ commit ef3e5fd403777d5c047ac91de75f32895058ff88
+	* agent/command-ssh.c (ssh_send_available_keys): New.
+	(ssh_handler_request_identities): Use ssh_send_available_keys.
+
+	agent: Show "Label:" field of private key when prompt the insertion.
+	+ commit 5986310866527e37c6df118b1582177934522e39
+	* agent/findkey.c (prompt_for_card): Use "Label:" field.
+	(agent_key_from_file): Use KEYMETA.
+
+	agent: Move confirmation handling into findkey.c.
+	+ commit 6a37240cf279b27cddcc88de93098c55f3f26701
+	* agent/agent.h (divert_tpm2_pksign, divert_tpm2_pkdecrypt): Fix API.
+	(divert_pksign, divert_pkdecrypt): Likewise.
+	* agent/divert-scd.c (ask_for_card): Remove.
+	(divert_pksign, divert_pkdecrypt): Don't call ask_for_card.
+	* agent/divert-tpm2.c (divert_tpm2_pksign, divert_tpm2_pkdecrypt):
+	Remove DESC_TEXT argument.
+	* agent/findkey.c (prompt_for_card): New (was: ask_for_card).
+	(agent_key_from_file): Call prompt_for_card when it's a key
+	on card.
+	* agent/pkdecrypt.c (agent_pkdecrypt): Follow the change of API.
+	* agent/pksign.c (agent_pksign_do): Likewise.
+
+2022-05-19  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent: Pop up dialog window for confirmation, when specified so.
+	+ commit 598b3fdfaa09b9071ceeb81f68052f3d35064292
+	* agent/findkey.c (agent_key_from_file): Support "Confirm:".
+
+	agent: Supply GRIP=NULL for agent_key_from_file, for real use.
+	+ commit 09357d7eae3efd8db1df79ef191f12038e905c6c
+	* agent/findkey.c (agent_key_from_file): Change the semantics of
+	GRIP.  Now, it's NULL for use by PKDECRYPT and PKSIGN/PKAUTH.
+	* agent/pkdecrypt.c (agent_pkdecrypt): Set GRIP=NULL.
+	* agent/pksign.c (agent_pksign_do): Likewise.
+
+2022-05-17  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Fix use of SCardListReaders for PC/SC.
+	+ commit 1b1684cf6192d9edb90a54ebe4a0e66b3d59a44b
+	* scd/apdu.c (apdu_dev_list_start): Initialize NREADER.
+
+2022-05-11  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Fail when no good algorithm attribute.
+	+ commit 53eddf9b9ea01210f71b851b5cb92a5f1cdb6f7d
+	* scd/app-openpgp.c (parse_algorithm_attribute): Return the error.
+	(change_keyattr): Follow the change.
+	(app_select_openpgp): Handle the error of parse_algorithm_attribute.
+
+2022-05-10  NIIBE Yutaka  <gniibe@fsij.org>
+
+	dirmngr: Fix for Windows.
+	+ commit 14068dfc74fffa9cdf2fd49712f4ffcfe6405ba0
+	* dirmngr/http.c (EHOSTUNREACH, EAFNOSUPPORT): Define when not
+	available.
+	[HTTP_USE_GNUTLS] (my_gnutls_read): Use recv for Windows.
+	[HTTP_USE_GNUTLS] (my_gnutls_write): Use send for Windows.
+
+	tests: Enable tests with keyboxd only when it's configured.
+	+ commit 09df630e4be7c44b89183181c1643f50ad606ae2
+	* tests/gpgscm/tests.scm (in-objdir): Move from...
+	* g13/all-tests.scm: ... here.
+	* tests/openpgp/all-tests.scm (keyboxd-enabled?): New.
+	(tests): Enable when keyboxd-enabled?.
+
+2022-05-06  Werner Koch  <wk@gnupg.org>
+
+	scd:p15: Improve the displayed S/N for Technology Nexus cards.
+	+ commit 3d7d7e8bfd1259e00104b6d52c86d5554fe5b9dd
+	* scd/app-p15.c (any_control_or_space_mem): New.
+	(get_dispserialno): Add new code.
+
+	scd:p15: Fix the the sanity check of the displayed S/N.
+	+ commit 6f612fd5f6d884bbc4645d55378d6ee01942109f
+	* scd/app-p15.c (any_control_or_space): Fix loop.
+
+2022-05-06  NIIBE Yutaka  <gniibe@fsij.org>
+
+	scd: Add workaround for ECC attribute on Yubikey.
+	+ commit 054d14887ef8fa1cbadef4ed2ea28213f25f5d25
+	* scd/app-openpgp.c (parse_algorithm_attribute): Skip possibly bogus
+	octet in a key attribute.
+
+2022-05-05  Werner Koch  <wk@gnupg.org>
+
+	scd:p15: Fix reading certificates without length info.
+	+ commit bbcca7357b017377fa311c507a940b32f62dcfa1
+	* scd/app-p15.c (readcert_by_cdf): Do not use extended mode if the CDF
+	object has no length info.  Add debug output when reading a cert.
+	(read_p15_info): No more need to disable extended mode for GeNUA cards.
+
+	scd: New debug flags "card".
+	+ commit 7dc5693926222d97a3dfe55b426d2b41204daa79
+	* scd/scdaemon.c (debug_flags): Add "card".
+	* scd/scdaemon.h (DBG_CARD_VALUE, DBG_CARD): New.
+
+	scd:openpgp: Fix a segv for cards supporting unknown curves.
+	+ commit 385f4841330e277949ddf2f13939b97481d2d29c
+	* common/openpgp-oid.c (get_keyalgo_string): Do not strdup NULL.
+
+2022-05-02  NIIBE Yutaka  <gniibe@fsij.org>
+
+	gpgscm: Fix handling an error for chdir.
+	+ commit 4fe8859541d0facd5c3aadbdff5202ee5bb563a8
+	* tests/gpgscm/ffi.c (do_chdir): Use gpg_error_from_syserror.
+
+	tests: Fix plain invocation of "make check".
+	+ commit 792374edb67698d46f003f1548e674f0c6ef8d44
+	* tests/openpgp/run-tests.scm: Check if *args* is null or not.
+
+	tests: Add a test for Ed25519 keys for non-protected secret.
+	+ commit 602c37ac0678d690a5b68d6c1749b8daa3d5f328
+	* tests/openpgp/issue5120.scm: New.
+
+2022-04-27  NIIBE Yutaka  <gniibe@fsij.org>
+
+	kbx: Fix a race condition which results no status report.
+	+ commit bd5dbdb8131cde182c79070e12f9e64a549643cd
+	* kbx/keyboxd.h (kbxd_status_printf): New.
+	* kbx/backend-support.c (be_return_pubkey): Use kbxd_status_printf.
+	* kbx/kbxserver.c (kbxd_status_printf): New.
+	* kbxd_start_command_handler (kbxd_start_command_handler): Don't
+	use set_assuan_context_func, because the function pointer is
+	shared by multiple threads.
+
+2022-04-26  Ingo Klöcker  <dev@ingo-kloecker.de>
+
+	gpg: Look up user ID to revoke by UID hash.
+	+ commit 35b17550706c8b7479ae96654feb97c05263cfc9
+	* g10/keyedit.c (find_userid_by_namehash, find_userid): New.
+	(keyedit_quick_revuid): Use find_userid() instead of iterating over the
+	nodes of the keyblock.
+	* tests/openpgp/quick-key-manipulation.scm: Add test for revoking a
+	user ID specified by its hash.
+
+2022-04-26  NIIBE Yutaka  <gniibe@fsij.org>
+
+	tests: Avoid auto-removal when test fails.
+	+ commit f27a70ecc268f9318dbf87d23c451a3bad464ed1
+	* tests/gpgscm/init.scm (*exit-status*): New.
+	(exit): Set *exit-status*.
+	* tests/gpgscm/tests.scm (mkdtemp-autoremove): Check
+	exit-status and only remove the directory if not zero.
+
+	tests: Support single invocation with variant.
+	+ commit ba2f2085a95be47a06ac6ba75a4c7def7c6599b2
+	* tests/openpgp/run-tests.scm: Add GPGSCM_TEST_VARIANT support.
+
+	dirmngr: Fix for C90 compiler.
+	+ commit d6eb2761330508d1c19f99ccdefefb1febbb81c4
+	* dirmngr/dirmngr.c (main): Declaration before a statement.
+
+	tests: Let make check-all work again.
+	+ commit 03e8668dbb27d83fb6064681ace560eb7154c569
+	* Makefile.am (TESTS_ENVIRONMENT): Add GNUPG_BUILD_ROOT.
+
+	tests: Use module_tests for testing agent/.
+	+ commit a9754879d127fd492606327b7397350f094f3ff4
+	* agent/Makefile.am (module_test): New.
+	* agent/all-tests.scm: Use module_tests instead of TESTS.
+
+	tests: Skip testsing g13 when it's not enabled.
+	+ commit adf24ce6182839f6c54106cc2a8d2dc81b815793
+	* g13/all-tests.scm: Skip the test by examining $objdir/Makefile.
+
+	tests: Fix check-all for tests/openpgp.
+	+ commit 16720e1f54db31f3f890756ec6b2280630569fa0
+	* tests/openpgp/Makefile.am: Revert the change by DISABLE_REGEXP.
+	* tests/openpgp/all-tests.scm: Likewise.
+
+2022-04-25  Werner Koch  <wk@gnupg.org>
+
+	Release 2.3.6.
+	+ commit 3a8164e69c3e753cf671a5c86305715232cc9c95
+
+
+	gpg: Avoid NULL ptr access due to corrupted packets.
+	+ commit f6caf5b17366efa93f806f22e7441eb27f4d382c
+	* g10/parse-packet.c (parse_signature): Do not create an opaque MPI
+	with NULL and length > 0
+	(parse_key): Ditto.
+
+2022-04-25  Todd Zullinger  <tmz@pobox.com>
+
+	sm: Use gpg_err_code() instead of -1.
+	+ commit beb79f2705ad24665f54c9ea2042a73b1f16f6bc
+	* sm/verify.c (gpgsm_verify): use gpg_err_code instead of 'rc == -1'
+	comparison.
+
+2022-04-25  Werner Koch  <wk@gnupg.org>
+
+	Deprecate the --supervised options.
+	+ commit ca5d5142c6d6eaba4572a086f8473e4aebdd3f9e
+	* agent/gpg-agent.c (main): Mark --supervised as deprecated.
+	* dirmngr/dirmngr.c (main): Ditto.
+
+	gpg: Emit an ERROR status as hint for a bad passphrase.
+	+ commit 0f8623d518d49541c1d54676d400916546ff38f4
+	* g10/mainproc.c (proc_symkey_enc): Issue new error code.
+	(proc_encrypted): Ditto.
+
+2022-04-25  NIIBE Yutaka  <gniibe@fsij.org>
+
+	common:iobuf: Exclude cases with IOBUF_INPUT_TEMP/IOBUF_OUTPUT_TEMP.
+	+ commit 2fc91e15c6bebb203162cc8445e68ee4ff934885
+	* common/iobuf.c (iobuf_read): Handle a case with IOBUF_INPUT_TEMP.
+	(iobuf_write): Handle a case with IOBUF_OUTPUT_TEMP.
+
+	scd: Fix hard-coded constant for RSA auth.
+	+ commit 2848fe4c84e5ee20ccd90f0ef4c9f78c6801e1f6
+	* scd/app-openpgp.c (do_auth): Allow larger data for RSA-4096.
+
+2022-04-22  Ingo Klöcker  <dev@ingo-kloecker.de>
+
+	gpg: Fix line end in error message.
+	+ commit 8b3a24e5176f64b101d2b073f2901852d8ecc691
+	* g10/keyedit.c (menu_adduid): Move linefeed character to the format
+	string.
+
+2022-04-22  NIIBE Yutaka  <gniibe@fsij.org>
+
+	agent: Not writing password into file.
+	+ commit e529c54fe3a83c1108347363a793c1cb9b790175
+	* agent/genkey.c (do_check_passphrase_pattern): Use stream to invoke
+	pattern check program.
+
+	scd: Don't inhibit SSH authentication for larger data if it can.
+	+ commit e8fb8e2b3e66d5ea8a3dc90afdc14611abf2c3da
+	* scd/app-openpgp.c (do_auth): Use command chaining if available.
+
 2022-04-21  Werner Koch  <wk@gnupg.org>
 
 	Release 2.3.5.
diff --git a/Makefile.am b/Makefile.am
index ca5e189..e542027 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -210,6 +210,7 @@ TESTS_ENVIRONMENT = \
 	PATH=$(abs_top_builddir)/tests/gpgscm:$(PATH) \
 	abs_top_srcdir=$(abs_top_srcdir) \
 	objdir=$(abs_top_builddir) \
+	GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
 	GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm
 
 .PHONY: check-all release sign-release
diff --git a/Makefile.in b/Makefile.in
index 8aa86cf..fd7c17d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -539,6 +539,7 @@ TESTS_ENVIRONMENT = \
 	PATH=$(abs_top_builddir)/tests/gpgscm:$(PATH) \
 	abs_top_srcdir=$(abs_top_srcdir) \
 	objdir=$(abs_top_builddir) \
+	GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
 	GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm
 
 
diff --git a/NEWS b/NEWS
index 728de50..64f4314 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,104 @@
+Noteworthy changes in version 2.3.7 (2022-07-11)
+------------------------------------------------
+
+  * gpg: Fix possibly garbled status messages in NOTATION_DATA.  This
+    bug could trick GPGME and other parsers to accept faked status
+    lines.  [T6027, CVE-2022-34903]
+
+  * gpg: Look up user ID to revoke by UID hash.  [T5936]
+
+  * gpg: Setup the 'usage' filter property for export.  [rG7aabd94b81]
+
+  * gpg,w32: Allow Unicode filenames for iobuf_cancel.  [rG4ee2009083]
+
+  * gpg: Fix reading AEAD preference.  [T6019]
+
+  * gpgsm: New option --compatibility-flags.  [rGf0b373cec9]
+
+  * gpgsm: Rework the PKCS#12 parser to support DFN issued keys.
+    [T6037]
+
+  * agent: New option --no-user-trustlist and --sys-trustlist-name.
+    [T5990]
+
+  * agent: Pop up dialog window for confirmation, when specified so.
+    [T5099]
+
+  * agent: Show "Label:" field of private key when prompt the
+    insertion.  [T5986]
+
+  * agent: Handle USAGE information in KEYINFO.  [rG295a6a7591]
+
+  * agent,ssh: Make not-inserted OpenPGP.3 keys available for SSH.
+    [T5996]
+
+  * agent,ssh: Support "Use-for-ssh" flag in private key.  [T5985]
+
+  * agent: New field "Prompt" to prevent asking card key insertion.
+    [T5987]
+
+  * agent: Support --format=ssh option for READKEY.  [T6012]
+
+  * agent: Add KEYATTR command.  [T5988]
+
+  * agent: Flush before calling ftruncate.  [T6035]
+
+  * agent: Do not consider --min-passphrase-len for the magic wand.
+    [rGae2f1f0785]
+
+  * kbx: Fix a race condition which results no status report.  [T5948]
+
+  * scd:openpgp: Fix a segv for cards supporting unknown curves.
+    [T5963]
+
+  * scd:p15: Fix reading certificates without length info.
+
+  * scd:p15: Improve the displayed S/N for Technology Nexus cards.
+
+  * scd:openpgp: Add workaround for ECC attribute on Yubikey.  [T5963]
+
+  * scd,piv: Fix status report of KEYPAIRINFO.  [rG64c8786105]
+
+  * scd:nks: Support the Telesec ESIGN application.  [T5219, T4938]
+
+  * scd: Fix use of SCardListReaders for PC/SC.  [T5979]
+
+  * scd: Support automatic card selection for READCERT with keygrip.
+    [T6003]
+
+  * scd: Support specifying keygrip for learn command.  [T6002]
+
+  * dirmngr: Fix for Windows when build against GNUTLS.  [T5899]
+
+  * gpg-connect-agent: Add --unbuffered option.
+
+  * gpg-connect-agent: Add a way to cancel an INQUIRE.  [T6010]
+
+  * gpgconf: New short options -V and -X
+
+  Release-info: https://dev.gnupg.org/T5947
+
+
+Noteworthy changes in version 2.3.6 (2022-04-25)
+------------------------------------------------
+
+  * gpg: Fix regression in 2.3.5 importing longer keys.  [T5941]
+
+  * gpg: Emit an ERROR status as hint for a bad passphrase.  [T5943]
+
+  * gpg: Avoid NULL-ptr access due to corrupted packets.  [T5940]
+
+  * gpgsm: Improve the "Certificate not found" error message.  [T5821]
+
+  * agent: Pass pattern directly to gpg-check-pattern.  [rGe529c54fe3]
+
+  * scd: Fix hard-coded constant for RSA authentication key OpenPGP.3.
+    [rG2848fe4c84]
+
+  Release-info: https://dev.gnupg.org/T5937
+  See-also: gnupg-announce/2022q2/000473.html
+
+
 Noteworthy changes in version 2.3.5 (2022-04-21)
 ------------------------------------------------
 
diff --git a/VERSION b/VERSION
index cc6c9a4..00355e2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.5
+2.3.7
diff --git a/agent/Makefile.am b/agent/Makefile.am
index d5998c7..fe2d7d2 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -111,10 +111,12 @@ $(PROGRAMS): $(common_libs) $(commonpth_libs) $(pwquery_libs)
 #
 # Module tests
 #
+module_tests = t-protect
+
 if DISABLE_TESTS
 TESTS =
 else
-TESTS = t-protect
+TESTS = $(module_tests)
 endif
 
 t_common_ldadd = $(common_libs)  $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
diff --git a/agent/Makefile.in b/agent/Makefile.in
index 32c8f07..626851e 100644
--- a/agent/Makefile.in
+++ b/agent/Makefile.in
@@ -127,7 +127,7 @@ 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_2)
+noinst_PROGRAMS = $(am__EXEEXT_3)
 @HAVE_DOSISH_SYSTEM_FALSE@am__append_2 = -DGNUPG_BINDIR="\"$(bindir)\""            \
 @HAVE_DOSISH_SYSTEM_FALSE@               -DGNUPG_LIBEXECDIR="\"$(libexecdir)\""    \
 @HAVE_DOSISH_SYSTEM_FALSE@               -DGNUPG_LIBDIR="\"$(libdir)/@PACKAGE@\""  \
@@ -147,7 +147,7 @@ noinst_PROGRAMS = $(am__EXEEXT_2)
 @GNUPG_PROTECT_TOOL_PGM_TRUE@am__append_8 = -DGNUPG_DEFAULT_PROTECT_TOOL="\"@GNUPG_PROTECT_TOOL_PGM@\""
 @GNUPG_DIRMNGR_LDAP_PGM_TRUE@am__append_9 = -DGNUPG_DEFAULT_DIRMNGR_LDAP="\"@GNUPG_DIRMNGR_LDAP_PGM@\""
 @HAVE_W32_SYSTEM_TRUE@am__append_10 = gpg-agent-w32info.o
-@DISABLE_TESTS_FALSE@TESTS = t-protect$(EXEEXT)
+@DISABLE_TESTS_FALSE@TESTS = $(am__EXEEXT_2)
 subdir = agent
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
@@ -172,7 +172,8 @@ CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)"
 @HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_1 =  \
 @HAVE_W32CE_SYSTEM_FALSE@	gpg-preset-passphrase$(EXEEXT)
-@DISABLE_TESTS_FALSE@am__EXEEXT_2 = t-protect$(EXEEXT)
+am__EXEEXT_2 = t-protect$(EXEEXT)
+@DISABLE_TESTS_FALSE@am__EXEEXT_3 = $(am__EXEEXT_2)
 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 \
@@ -615,6 +616,11 @@ gpg_preset_passphrase_LDADD = \
          $(pwquery_libs) $(common_libs) $(LIBASSUAN_LIBS) \
 	 $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
 
+
+#
+# Module tests
+#
+module_tests = t-protect
 t_common_ldadd = $(common_libs)  $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
 	          $(LIBINTL) $(LIBICONV) $(NETLIBS)
 
diff --git a/agent/agent.h b/agent/agent.h
index 4ee8e40..30f3020 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -37,6 +37,7 @@
 #include "../common/sysutils.h" /* (gnupg_fd_t) */
 #include "../common/session-env.h"
 #include "../common/shareddefs.h"
+#include "../common/name-value.h"
 
 /* To convey some special hash algorithms we use algorithm numbers
    reserved for application use. */
@@ -157,6 +158,13 @@ struct
      interactively mark certificate in trustlist.txt as trusted. */
   int allow_mark_trusted;
 
+  /* Only use the system trustlist.  */
+  int no_user_trustlist;
+
+  /* The standard system trustlist is SYSCONFDIR/trustlist.txt.  This
+   * option can be used to change the name.  */
+  const char *sys_trustlist_name;
+
   /* If this global option is true, the Assuan command
      PRESET_PASSPHRASE is allowed.  */
   int allow_preset_passphrase;
@@ -392,6 +400,7 @@ struct card_key_info_s
   char keygrip[41];
   char *serialno;
   char *idstr;
+  char *usage;
 };
 
 /*-- gpg-agent.c --*/
@@ -463,10 +472,13 @@ gpg_error_t agent_key_from_file (ctrl_t ctrl,
                                  gcry_sexp_t *result,
                                  char **r_passphrase, time_t *r_timestamp);
 gpg_error_t agent_raw_key_from_file (ctrl_t ctrl, const unsigned char *grip,
-                                     gcry_sexp_t *result);
+                                     gcry_sexp_t *result, nvc_t *r_keymeta);
 gpg_error_t agent_public_key_from_file (ctrl_t ctrl,
                                         const unsigned char *grip,
                                         gcry_sexp_t *result);
+gpg_error_t agent_ssh_key_from_file (ctrl_t ctrl,
+                                     const unsigned char *grip,
+                                     gcry_sexp_t *result);
 int agent_pk_get_algo (gcry_sexp_t s_key);
 int agent_is_tpm2_key(gcry_sexp_t s_key);
 int agent_key_available (const unsigned char *grip);
@@ -477,6 +489,7 @@ gpg_error_t agent_key_info_from_file (ctrl_t ctrl, const unsigned char *grip,
 gpg_error_t agent_delete_key (ctrl_t ctrl, const char *desc_text,
                               const unsigned char *grip,
                               int force, int only_stubs);
+gpg_error_t agent_update_private_key (const unsigned char *grip, nvc_t pk);
 
 /*-- call-pinentry.c --*/
 void initialize_module_call_pinentry (void);
@@ -593,11 +606,11 @@ void agent_reload_trustlist (void);
 
 /*-- divert-tpm2.c --*/
 #ifdef HAVE_LIBTSS
-int divert_tpm2_pksign (ctrl_t ctrl, const char *desc_text,
+int divert_tpm2_pksign (ctrl_t ctrl,
                         const unsigned char *digest, size_t digestlen, int algo,
                         const unsigned char *shadow_info, unsigned char **r_sig,
                         size_t *r_siglen);
-int divert_tpm2_pkdecrypt (ctrl_t ctrl, const char *desc_text,
+int divert_tpm2_pkdecrypt (ctrl_t ctrl,
                            const unsigned char *cipher,
                            const unsigned char *shadow_info,
                            char **r_buf, size_t *r_len, int *r_padding);
@@ -605,25 +618,25 @@ int divert_tpm2_writekey (ctrl_t ctrl, const unsigned char *grip,
                           gcry_sexp_t s_skey);
 #else /*!HAVE_LIBTSS*/
 static inline int
-divert_tpm2_pksign (ctrl_t ctrl, const char *desc_text,
+divert_tpm2_pksign (ctrl_t ctrl,
                     const unsigned char *digest,
                     size_t digestlen, int algo,
                     const unsigned char *shadow_info,
                     unsigned char **r_sig,
                     size_t *r_siglen)
 {
-  (void)ctrl; (void)desc_text; (void)digest; (void)digestlen;
+  (void)ctrl; (void)digest; (void)digestlen;
   (void)algo; (void)shadow_info; (void)r_sig; (void)r_siglen;
   return gpg_error (GPG_ERR_NOT_SUPPORTED);
 }
 static inline int
-divert_tpm2_pkdecrypt (ctrl_t ctrl, const char *desc_text,
+divert_tpm2_pkdecrypt (ctrl_t ctrl,
                        const unsigned char *cipher,
                        const unsigned char *shadow_info,
                        char **r_buf, size_t *r_len,
                        int *r_padding)
 {
-  (void)ctrl; (void)desc_text; (void)cipher; (void)shadow_info;
+  (void)ctrl; (void)cipher; (void)shadow_info;
   (void)r_buf; (void)r_len; (void)r_padding;
   return gpg_error (GPG_ERR_NOT_SUPPORTED);
 }
@@ -639,15 +652,14 @@ divert_tpm2_writekey (ctrl_t ctrl, const unsigned char *grip,
 
 
 /*-- divert-scd.c --*/
-int divert_pksign (ctrl_t ctrl, const char *desc_text,
+int divert_pksign (ctrl_t ctrl,
                    const unsigned char *grip,
                    const unsigned char *digest, size_t digestlen, int algo,
-                   const unsigned char *shadow_info, unsigned char **r_sig,
+                   unsigned char **r_sig,
                    size_t *r_siglen);
-int divert_pkdecrypt (ctrl_t ctrl, const char *desc_text,
+int divert_pkdecrypt (ctrl_t ctrl,
                       const unsigned char *grip,
                       const unsigned char *cipher,
-                      const unsigned char *shadow_info,
                       char **r_buf, size_t *r_len, int *r_padding);
 int divert_generic_cmd (ctrl_t ctrl,
                         const char *cmdline, void *assuan_context);
diff --git a/agent/all-tests.scm b/agent/all-tests.scm
index 6449ebb..9376adf 100644
--- a/agent/all-tests.scm
+++ b/agent/all-tests.scm
@@ -32,4 +32,4 @@
 		      (path-join (getenv "objdir") "agent" name)))
       (parse-makefile-expand (in-srcdir "agent" "Makefile.am")
 			     (lambda (filename port key) (parse-makefile port key))
-			     "TESTS")))
+			     "module_tests")))
diff --git a/agent/call-daemon.c b/agent/call-daemon.c
index 26c25fc..0c36052 100644
--- a/agent/call-daemon.c
+++ b/agent/call-daemon.c
@@ -414,11 +414,7 @@ daemon_start (enum daemon_type type, ctrl_t ctrl)
 
   i=0;
   if (!opt.running_detached)
-    {
-      if (log_get_fd () != -1)
-        no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
-      no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
-    }
+    no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
   no_close_list[i] = ASSUAN_INVALID_FD;
 
   /* Connect to the daemon and perform initial handshaking.  Use
@@ -469,9 +465,7 @@ daemon_start (enum daemon_type type, ctrl_t ctrl)
     xfree (databuf);
   }
 
-  /* Tell the daemon we want him to send us an event signal.  We
-     don't support this for W32CE.  */
-#ifndef HAVE_W32CE_SYSTEM
+  /* Tell the daemon we want him to send us an event signal.  */
   if (opt.sigusr2_enabled)
     {
       char buf[100];
@@ -484,7 +478,6 @@ daemon_start (enum daemon_type type, ctrl_t ctrl)
 #endif
       assuan_transact (ctx, buf, NULL, NULL, NULL, NULL, NULL, NULL);
     }
-#endif /*HAVE_W32CE_SYSTEM*/
 
   g->primary_ctx = ctx;
   g->primary_ctx_reusable = 0;
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index bb55a37..c6c52be 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -57,7 +57,9 @@
  * passphrase will be rendered as zbase32 which results for 150 bits
  * in a string of 30 characters.  That fits nicely into the 5
  * character blocking which pinentry can do.  128 bits would actually
- * be sufficient but can't be formatted nicely. */
+ * be sufficient but can't be formatted nicely.  Please do not change
+ * this value because pattern check files may let such passwords
+ * always pass. */
 #define DEFAULT_GENPIN_BITS 150
 
 /* The assuan context of the current pinentry. */
@@ -394,11 +396,7 @@ start_pinentry (ctrl_t ctrl)
 
   i=0;
   if (!opt.running_detached)
-    {
-      if (log_get_fd () != -1)
-        no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
-      no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
-    }
+    no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
   no_close_list[i] = ASSUAN_INVALID_FD;
 
   rc = assuan_new (&ctx);
@@ -848,21 +846,20 @@ estimate_passphrase_quality (const char *pw)
 
 
 /* Generate a random passphrase in zBase32 encoding (RFC-6189) to be
- * used by Pinentry to suggest a passphrase.  */
+ * used by Pinentry to suggest a passphrase.  Note that we have the
+ * same algorithm in gpg.c for --gen-random at level 30.  It is
+ * important that we always output exactly 30 characters to match the
+ * special exception we have in the pattern file for symmetric
+ * encryption.  */
 static char *
 generate_pin (void)
 {
-  unsigned int nbits = opt.min_passphrase_len * 8;
-  size_t nbytes;
+  unsigned int nbits = DEFAULT_GENPIN_BITS;
+  size_t nbytes = nbytes = (nbits + 7) / 8;
   void *rand;
   char *generated;
 
-  if (nbits < 128)
-    nbits = DEFAULT_GENPIN_BITS;
-
-  nbytes = (nbits + 7) / 8;
-
-  rand = gcry_random_bytes_secure (nbytes, GCRY_STRONG_RANDOM);
+   rand = gcry_random_bytes_secure (nbytes, GCRY_STRONG_RANDOM);
   if (!rand)
     {
       log_error ("failed to generate random pin\n");
diff --git a/agent/call-scd.c b/agent/call-scd.c
index 154ea34..91e28e6 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -384,7 +384,12 @@ inq_needpin (void *opaque, const char *line)
       rc = parm->getpin_cb (parm->getpin_cb_arg, parm->getpin_cb_desc,
                             line, pin, pinlen);
       if (!rc)
-        rc = assuan_send_data (parm->ctx, pin, pinlen);
+        {
+          assuan_begin_confidential (parm->ctx);
+          rc = assuan_send_data (parm->ctx, pin, pinlen);
+          assuan_end_confidential (parm->ctx);
+        }
+      wipememory (pin, pinlen);
       xfree (pin);
     }
   else if ((s = has_leading_keyword (line, "POPUPPINPADPROMPT")))
@@ -934,6 +939,7 @@ card_keyinfo_cb (void *opaque, const char *line)
       int n;
       struct card_key_info_s **l_p = &parm->list;
 
+      /* It's going to append the information at the end.  */
       while ((*l_p))
         l_p = &(*l_p)->next;
 
@@ -971,7 +977,7 @@ card_keyinfo_cb (void *opaque, const char *line)
         ;
 
       if (!n)
-        goto parm_error;
+        goto skip;
 
       keyinfo->serialno = xtrymalloc (n+1);
       if (!keyinfo->serialno)
@@ -983,18 +989,34 @@ card_keyinfo_cb (void *opaque, const char *line)
       line = s;
 
       if (!*line)
-        goto parm_error;
+        goto skip;
 
       while (spacep (line))
         line++;
 
       if (!*line)
-        goto parm_error;
+        goto skip;
 
-      keyinfo->idstr = xtrystrdup (line);
+      for (s = line; *s && !spacep (s); s++)
+        ;
+
+      keyinfo->idstr = xtrymalloc (s - line + 1);
       if (!keyinfo->idstr)
         goto alloc_error;
+      memcpy (keyinfo->idstr, line, s - line);
+      keyinfo->idstr[s - line] = 0;
+
+      while (spacep (s))
+        s++;
+
+      if (!*s)
+        goto skip;
+
+      keyinfo->usage = xtrystrdup (s);
+      if (!keyinfo->usage)
+        goto alloc_error;
 
+    skip:
       *l_p = keyinfo;
     }
   else if (keywordlen == 12 && !memcmp (keyword, "PINCACHE_PUT", keywordlen))
@@ -1003,6 +1025,8 @@ card_keyinfo_cb (void *opaque, const char *line)
   return err;
 
  alloc_error:
+  xfree (keyinfo->serialno);
+  xfree (keyinfo->idstr);
   xfree (keyinfo);
   if (!parm->error)
     parm->error = gpg_error_from_syserror ();
@@ -1026,6 +1050,7 @@ agent_card_free_keyinfo (struct card_key_info_s *l)
       l_next = l->next;
       xfree (l->serialno);
       xfree (l->idstr);
+      xfree (l->usage);
       xfree (l);
     }
 }
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index e12e8ac..ce2b5df 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -2449,155 +2449,245 @@ card_key_available (ctrl_t ctrl, const struct card_key_info_s *keyinfo,
   return 0;
 }
 
+static struct card_key_info_s *
+get_ssh_keyinfo_on_cards (ctrl_t ctrl)
+{
+  struct card_key_info_s *keyinfo_on_cards = NULL;
+  gpg_error_t err;
+  char *serialno;
 
-
+  if (opt.disable_daemon[DAEMON_SCD])
+    return NULL;
 
-/*
+  /* Scan for new device(s).  */
+  err = agent_card_serialno (ctrl, &serialno, NULL);
+  if (err)
+    {
+      if (opt.verbose)
+        log_info (_("error getting list of cards: %s\n"),
+                  gpg_strerror (err));
+      return NULL;
+    }
 
-  Request handler.  Each handler is provided with a CTRL context, a
-  REQUEST object and a RESPONSE object.  The actual request is to be
-  read from REQUEST, the response needs to be written to RESPONSE.
+  xfree (serialno);
 
-*/
+  err = agent_card_keyinfo (ctrl, NULL, GCRY_PK_USAGE_AUTH, &keyinfo_on_cards);
+  if (err)
+    return NULL;
 
+  return keyinfo_on_cards;
+}
 
-/* Handler for the "request_identities" command.  */
 static gpg_error_t
-ssh_handler_request_identities (ctrl_t ctrl,
-                                estream_t request, estream_t response)
+ssh_send_available_keys (ctrl_t ctrl, estream_t key_blobs, u32 *key_counter_p)
 {
-  u32 key_counter;
-  estream_t key_blobs;
-  gcry_sexp_t key_public;
   gpg_error_t err;
-  int ret;
+  char *dirname;
+  gnupg_dir_t dir = NULL;
+  gnupg_dirent_t dir_entry;
+  char hexgrip[41];
   ssh_control_file_t cf = NULL;
-  gpg_error_t ret_err;
+  struct card_key_info_s *keyinfo_on_cards, *l;
+  char *cardsn;
+  gcry_sexp_t key_public = NULL;
 
-  (void)request;
+  err = open_control_file (&cf, 0);
+  if (err)
+    return err;
 
-  /* Prepare buffer stream.  */
+  /* First, get information keys available on cards on-line. */
+  keyinfo_on_cards = get_ssh_keyinfo_on_cards (ctrl);
 
-  key_public = NULL;
-  key_counter = 0;
-
-  key_blobs = es_fopenmem (0, "r+b");
-  if (! key_blobs)
+  /* Look at all the registered and non-disabled keys, in sshcontrol.  */
+  /* And, look at all keys with "Use-for-ssh:" flag.  */
+  dirname = make_filename_try (gnupg_homedir (),
+                               GNUPG_PRIVATE_KEYS_DIR, NULL);
+  if (!dirname)
     {
       err = gpg_error_from_syserror ();
-      goto out;
+      agent_card_free_keyinfo (keyinfo_on_cards);
+      return err;
     }
+  dir = gnupg_opendir (dirname);
+  if (!dir)
+    {
+      err = gpg_error_from_syserror ();
+      xfree (dirname);
+      agent_card_free_keyinfo (keyinfo_on_cards);
+      return err;
+    }
+  xfree (dirname);
 
-  /* First check whether a key is currently available in the card
-     reader - this should be allowed even without being listed in
-     sshcontrol. */
-
-  if (!opt.disable_daemon[DAEMON_SCD])
+  while ( (dir_entry = gnupg_readdir (dir)) )
     {
-      char *serialno;
-      struct card_key_info_s *keyinfo_list;
-      struct card_key_info_s *keyinfo;
+      struct card_key_info_s *l_prev = NULL;
+      int disabled, is_ssh;
+      unsigned char grip[20];
+
+      cardsn = NULL;
+      if (strlen (dir_entry->d_name) != 44
+          || strcmp (dir_entry->d_name + 40, ".key"))
+        continue;
+      strncpy (hexgrip, dir_entry->d_name, 40);
+      hexgrip[40] = 0;
+
+      if ( hex2bin (hexgrip, grip, 20) < 0 )
+        continue; /* Bad hex string.  */
 
-      /* Scan device(s), and get list of KEYGRIP.  */
-      err = agent_card_serialno (ctrl, &serialno, NULL);
+      /* Check if it's a key on card.  */
+      for (l = keyinfo_on_cards; l; l = l->next)
+        if (!memcmp (l->keygrip, hexgrip, 40))
+          break;
+        else
+          l_prev = l;
+
+      /* Check if it's listed in "ssh_control" file.  */
+      disabled = is_ssh = 0;
+      err = search_control_file (cf, hexgrip, &disabled, NULL, NULL);
       if (!err)
         {
-          xfree (serialno);
-          err = agent_card_keyinfo (ctrl, NULL, GCRY_PK_USAGE_AUTH,
-                                    &keyinfo_list);
+          if (!disabled)
+            is_ssh = 1;
         }
+      else if (gpg_err_code (err) != GPG_ERR_EOF)
+        break;
 
+      if (l)
+        {
+          err = card_key_available (ctrl, l, &key_public, &cardsn);
+          /* Remove the entry from the list of KEYINFO_ON_CARD */
+          if (l_prev)
+            l_prev->next = l->next;
+          else
+            keyinfo_on_cards = l->next;
+          xfree (l->serialno);
+          xfree (l->idstr);
+          xfree (l->usage);
+          xfree (l);
+          l = NULL;
+        }
+      else if (is_ssh)
+        err = agent_public_key_from_file (ctrl, grip, &key_public);
+      else
+        /* Examine the file if it's suitable for SSH.  */
+        err = agent_ssh_key_from_file (ctrl, grip, &key_public);
       if (err)
         {
-          if (opt.verbose)
-            log_info (_("error getting list of cards: %s\n"),
-                      gpg_strerror (err));
-          goto scd_out;
+          /* Clear ERR, skiping the key in question.  */
+          err = 0;
+          continue;
         }
 
-      for (keyinfo = keyinfo_list; keyinfo; keyinfo = keyinfo->next)
+      err = ssh_send_key_public (key_blobs, key_public, cardsn);
+      xfree (cardsn);
+      if (err)
         {
-          char *cardsn;
-
-          if (card_key_available (ctrl, keyinfo, &key_public, &cardsn))
-            continue;
-
-          err = ssh_send_key_public (key_blobs, key_public, cardsn);
-          gcry_sexp_release (key_public);
-          key_public = NULL;
-          xfree (cardsn);
-          if (err)
+          if (opt.debug)
+            gcry_log_debugsxp ("pubkey", key_public);
+          if (gpg_err_code (err) == GPG_ERR_UNKNOWN_CURVE
+              || gpg_err_code (err) == GPG_ERR_INV_CURVE)
             {
-              if (opt.verbose)
-                gcry_log_debugsxp ("pubkey", key_public);
-              if (gpg_err_code (err) == GPG_ERR_UNKNOWN_CURVE
-                  || gpg_err_code (err) == GPG_ERR_INV_CURVE)
-                {
-                  /* For example a Brainpool curve or a curve we don't
-                   * support at all but a smartcard lists that curve.
-                   * We ignore them.  */
-                }
-              else
-                {
-                  agent_card_free_keyinfo (keyinfo_list);
-                  goto out;
-                }
+              /* For example a Brainpool curve or a curve we don't
+               * support at all but a smartcard lists that curve.
+               * We ignore them.  */
             }
           else
-            key_counter++;
+            {
+              gcry_sexp_release (key_public);
+              break;  /* the readdir loop.  */
+            }
         }
+      else /* Success */
+        (*key_counter_p)++;
 
-      agent_card_free_keyinfo (keyinfo_list);
+      gcry_sexp_release (key_public);
     }
 
- scd_out:
-  /* Then look at all the registered and non-disabled keys. */
-  err = open_control_file (&cf, 0);
-  if (err)
-    goto out;
+  gnupg_closedir (dir);
+  ssh_close_control_file (cf);
+
+  /* Lastly, handle remaining keys which don't have the stub files.  */
+  for (l = keyinfo_on_cards; l; l = l->next)
+     {
+       cardsn = NULL;
+       if (card_key_available (ctrl, l, &key_public, &cardsn))
+         continue;
+
+       err = ssh_send_key_public (key_blobs, key_public, cardsn);
+       xfree (cardsn);
+       if (err)
+         {
+           if (opt.debug)
+             gcry_log_debugsxp ("pubkey", key_public);
+           if (gpg_err_code (err) == GPG_ERR_UNKNOWN_CURVE
+               || gpg_err_code (err) == GPG_ERR_INV_CURVE)
+             {
+               /* For example a Brainpool curve or a curve we don't
+                * support at all but a smartcard lists that curve.
+                * We ignore them.  */
+             }
+           else
+             {
+               gcry_sexp_release (key_public);
+               break;
+             }
+         }
+       else /* Success.  */
+         (*key_counter_p)++;
+
+       gcry_sexp_release (key_public);
+     }
+
+  agent_card_free_keyinfo (keyinfo_on_cards);
 
-  while (!read_control_file_item (cf))
-    {
-      unsigned char grip[20];
+  return err;
+}
+
 
-      if (!cf->item.valid)
-        continue; /* Should not happen.  */
-      if (cf->item.disabled)
-        continue;
-      log_assert (strlen (cf->item.hexgrip) == 40);
-      hex2bin (cf->item.hexgrip, grip, sizeof (grip));
+/*
 
-      err = agent_public_key_from_file (ctrl, grip, &key_public);
-      if (err)
-        {
-          log_error ("%s:%d: key '%s' skipped: %s\n",
-                     cf->fname, cf->lnr, cf->item.hexgrip,
-                     gpg_strerror (err));
-          continue;
-        }
+  Request handler.  Each handler is provided with a CTRL context, a
+  REQUEST object and a RESPONSE object.  The actual request is to be
+  read from REQUEST, the response needs to be written to RESPONSE.
 
-      err = ssh_send_key_public (key_blobs, key_public, NULL);
-      if (err)
-        goto out;
-      gcry_sexp_release (key_public);
-      key_public = NULL;
+*/
 
-      key_counter++;
-    }
-  err = 0;
 
-  ret = es_fseek (key_blobs, 0, SEEK_SET);
-  if (ret)
+/* Handler for the "request_identities" command.  */
+static gpg_error_t
+ssh_handler_request_identities (ctrl_t ctrl,
+                                estream_t request, estream_t response)
+{
+  u32 key_counter;
+  estream_t key_blobs;
+  gpg_error_t err;
+  int ret;
+  gpg_error_t ret_err;
+
+  (void)request;
+
+  /* Prepare buffer stream.  */
+
+  key_counter = 0;
+
+  key_blobs = es_fopenmem (0, "r+b");
+  if (! key_blobs)
     {
       err = gpg_error_from_syserror ();
       goto out;
     }
 
+  err = ssh_send_available_keys (ctrl, key_blobs, &key_counter);
+  if (!err)
+    {
+      ret = es_fseek (key_blobs, 0, SEEK_SET);
+      if (ret)
+        err = gpg_error_from_syserror ();
+    }
+
  out:
   /* Send response.  */
 
-  gcry_sexp_release (key_public);
-
   if (!err)
     {
       ret_err = stream_write_byte (response, SSH_RESPONSE_IDENTITIES_ANSWER);
@@ -2614,7 +2704,6 @@ ssh_handler_request_identities (ctrl_t ctrl,
     }
 
   es_fclose (key_blobs);
-  close_control_file (cf);
 
   return ret_err;
 }
@@ -2671,7 +2760,7 @@ data_sign (ctrl_t ctrl, ssh_key_type_spec_t *spec,
       char *fpr, *prompt;
       char *comment = NULL;
 
-      err = agent_raw_key_from_file (ctrl, ctrl->keygrip, &key);
+      err = agent_raw_key_from_file (ctrl, ctrl->keygrip, &key, NULL);
       if (err)
         goto out;
       err = ssh_get_fingerprint_string (key, opt.ssh_fingerprint_digest, &fpr);
diff --git a/agent/command.c b/agent/command.c
index a021eef..7f42b99 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -445,10 +445,13 @@ leave_cmd (assuan_context_t ctx, gpg_error_t err)
 /* Take the keyinfo for cards from our local cache.  Actually this
  * cache could be a global one but then we would need to employ
  * reference counting.  */
-struct card_key_info_s *
+static struct card_key_info_s *
 get_keyinfo_on_cards (ctrl_t ctrl)
 {
-  struct card_key_info_s *keyinfo_on_cards;
+  struct card_key_info_s *keyinfo_on_cards = NULL;
+
+  if (opt.disable_daemon[DAEMON_SCD])
+    return NULL;
 
   if (ctrl->server_local->last_card_keyinfo.ki
       && ctrl->server_local->last_card_keyinfo.eventno == eventcounter.card
@@ -1197,10 +1200,99 @@ cmd_genkey (assuan_context_t ctx, char *line)
 }
 
 
+static const char hlp_keyattr[] =
+  "KEYATTR [--delete] <hexstring_with_keygrip> <ATTRNAME> [<VALUE>]\n"
+  "\n"
+  "For the secret key, show the attribute of ATTRNAME.  With VALUE,\n"
+  "put the value to the attribute.  Use --delete option to delete.";
+static gpg_error_t
+cmd_keyattr (assuan_context_t ctx, char *line)
+{
+  ctrl_t ctrl = assuan_get_pointer (ctx);
+  gpg_error_t err;
+  const char *argv[3];
+  int argc;
+  unsigned char grip[20];
+  int opt_delete;
+
+  if (ctrl->restricted)
+    return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
+
+  opt_delete = has_option (line, "--delete");
+
+  line = skip_options (line);
+
+  argc = split_fields (line, argv, DIM (argv));
+  if (argc < 2)
+    {
+      err = gpg_error (GPG_ERR_MISSING_VALUE);
+      goto leave;
+    }
 
+  if (!strcmp (argv[1], "Key:") /* It allows only access to attribute */
+      /* Make sure ATTRNAME ends with colon.  */
+      || argv[1][strlen (argv[1]) - 1] != ':')
+    {
+      err = gpg_error (GPG_ERR_INV_PARAMETER);
+      goto leave;
+    }
+
+  err = parse_keygrip (ctx, argv[0], grip);
+  if (err)
+    goto leave;
+
+  if (!err)
+    {
+      gcry_sexp_t s_key = NULL;
+      nvc_t keymeta = NULL;
+      const char *p;
+
+      err = agent_raw_key_from_file (ctrl, grip, &s_key, &keymeta);
+      if (keymeta == NULL)      /* Not extended format? */
+        {
+          err = gpg_error (GPG_ERR_INV_DATA);
+          goto leave;
+        }
+
+      if (argc == 2)
+        {
+          nve_t e = nvc_lookup (keymeta, argv[1]);
+
+          if (opt_delete)
+            {
+              if (e)
+                {
+                  nvc_delete (keymeta, e);
+                  goto key_attr_write;
+                }
+            }
+          else if (e)
+            {
+              p = nve_value (e);
+              if (p)
+                err = assuan_send_data (ctx, p, strlen (p));
+            }
+        }
+      else if (argc == 3)
+        {
+          err = nvc_set (keymeta, argv[1], argv[2]);
+        key_attr_write:
+          if (!err)
+            err = nvc_set_private_key (keymeta, s_key);
+          if (!err)
+            err = agent_update_private_key (grip, keymeta);
+        }
+
+      nvc_release (keymeta);
+      gcry_sexp_release (s_key);
+    }
+
+ leave:
+  return leave_cmd (ctx, err);
+}
 
 static const char hlp_readkey[] =
-  "READKEY [--no-data] <hexstring_with_keygrip>\n"
+  "READKEY [--no-data] [--format=ssh] <hexstring_with_keygrip>\n"
   "                    --card <keyid>\n"
   "\n"
   "Return the public key for the given keygrip or keyid.\n"
@@ -1213,20 +1305,22 @@ cmd_readkey (assuan_context_t ctx, char *line)
   unsigned char grip[20];
   gcry_sexp_t s_pkey = NULL;
   unsigned char *pkbuf = NULL;
-  char *serialno = NULL;
-  char *keyidbuf = NULL;
   size_t pkbuflen;
-  int opt_card, opt_no_data;
+  int opt_card, opt_no_data, opt_format_ssh;
 
   if (ctrl->restricted)
     return leave_cmd (ctx, gpg_error (GPG_ERR_FORBIDDEN));
 
   opt_no_data = has_option (line, "--no-data");
   opt_card = has_option (line, "--card");
+  opt_format_ssh = has_option (line, "--format=ssh");
+
   line = skip_options (line);
 
   if (opt_card)
     {
+      char *serialno = NULL;
+      char *keyidbuf = NULL;
       const char *keyid = line;
 
       rc = agent_card_getattr (ctrl, "SERIALNO", &serialno, NULL);
@@ -1267,7 +1361,8 @@ cmd_readkey (assuan_context_t ctx, char *line)
             goto leave;
         }
 
-        rc = opt_no_data? 0 : assuan_send_data (ctx, pkbuf, pkbuflen);
+      xfree (serialno);
+      xfree (keyidbuf);
     }
   else
     {
@@ -1278,23 +1373,47 @@ cmd_readkey (assuan_context_t ctx, char *line)
       rc = agent_public_key_from_file (ctrl, grip, &s_pkey);
       if (!rc)
         {
-          pkbuflen = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, NULL, 0);
-          log_assert (pkbuflen);
-          pkbuf = xtrymalloc (pkbuflen);
-          if (!pkbuf)
-            rc = gpg_error_from_syserror ();
+          if (opt_format_ssh)
+            {
+              estream_t stream = NULL;
+
+              stream = es_fopenmem (0, "r+b");
+              if (!stream)
+                {
+                  rc = gpg_error_from_syserror ();
+                  goto leave;
+                }
+
+              rc = ssh_public_key_in_base64 (s_pkey, stream, "(none)");
+              if (rc)
+                {
+                  es_fclose (stream);
+                  goto leave;
+                }
+
+              rc = es_fclose_snatch (stream, (void **)&pkbuf, &pkbuflen);
+              if (rc)
+                goto leave;
+            }
           else
             {
+              pkbuflen = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON, NULL, 0);
+              log_assert (pkbuflen);
+              pkbuf = xtrymalloc (pkbuflen);
+              if (!pkbuf)
+                {
+                  rc = gpg_error_from_syserror ();
+                  goto leave;
+                }
               pkbuflen = gcry_sexp_sprint (s_pkey, GCRYSEXP_FMT_CANON,
                                            pkbuf, pkbuflen);
-              rc = opt_no_data? 0 : assuan_send_data (ctx, pkbuf, pkbuflen);
             }
         }
     }
 
+  rc = opt_no_data? 0 : assuan_send_data (ctx, pkbuf, pkbuflen);
+
  leave:
-  xfree (keyidbuf);
-  xfree (serialno);
   xfree (pkbuf);
   gcry_sexp_release (s_pkey);
   return leave_cmd (ctx, rc);
@@ -1431,7 +1550,7 @@ do_one_keyinfo (ctrl_t ctrl, const unsigned char *grip, assuan_context_t ctx,
     {
       gcry_sexp_t key;
 
-      if (!agent_raw_key_from_file (ctrl, grip, &key))
+      if (!agent_raw_key_from_file (ctrl, grip, &key, NULL))
         {
           ssh_get_fingerprint_string (key, with_ssh_fpr, &fpr);
           gcry_sexp_release (key);
@@ -1694,6 +1813,7 @@ send_back_passphrase (assuan_context_t ctx, int via_data, const char *pw)
           xfree (p);
         }
     }
+  assuan_end_confidential (ctx);
   return rc;
 }
 
@@ -2386,7 +2506,11 @@ cmd_preset_passphrase (assuan_context_t ctx, char *line)
 
       rc = print_assuan_status (ctx, "INQUIRE_MAXLEN", "%zu", maxlen);
       if (!rc)
-	rc = assuan_inquire (ctx, "PASSPHRASE", &passphrase, &len, maxlen);
+        {
+          assuan_begin_confidential (ctx);
+          rc = assuan_inquire (ctx, "PASSPHRASE", &passphrase, &len, maxlen);
+          assuan_end_confidential (ctx);
+        }
     }
   else
     rc = set_error (GPG_ERR_NOT_IMPLEMENTED, "passphrase is required");
@@ -2395,7 +2519,10 @@ cmd_preset_passphrase (assuan_context_t ctx, char *line)
     {
       rc = agent_put_cache (ctrl, grip_clear, CACHE_MODE_ANY, passphrase, ttl);
       if (opt_inquire)
-	xfree (passphrase);
+        {
+	  wipememory (passphrase, len);
+          xfree (passphrase);
+        }
     }
 
 leave:
@@ -3218,8 +3345,12 @@ cmd_put_secret (assuan_context_t ctx, char *line)
     {
       err = print_assuan_status (ctx, "INQUIRE_MAXLEN", "%u",MAXLEN_PUT_SECRET);
       if (!err)
-        err = assuan_inquire (ctx, "SECRET",
-                              &value, &valuelen, MAXLEN_PUT_SECRET);
+        {
+          assuan_begin_confidential (ctx);
+          err = assuan_inquire (ctx, "SECRET",
+                                &value, &valuelen, MAXLEN_PUT_SECRET);
+          assuan_end_confidential (ctx);
+        }
       if (err)
         goto leave;
     }
@@ -4002,7 +4133,8 @@ register_commands (assuan_context_t ctx)
     { "RELOADAGENT",    cmd_reloadagent,hlp_reloadagent },
     { "GETINFO",        cmd_getinfo,   hlp_getinfo },
     { "KEYTOCARD",      cmd_keytocard, hlp_keytocard },
-    { "KEYTOTPM",	cmd_keytotpm, hlp_keytotpm },
+    { "KEYTOTPM",       cmd_keytotpm, hlp_keytotpm },
+    { "KEYATTR",        cmd_keyattr, hlp_keyattr },
     { NULL }
   };
   int i, rc;
diff --git a/agent/divert-scd.c b/agent/divert-scd.c
index 273f3a8..ed0173e 100644
--- a/agent/divert-scd.c
+++ b/agent/divert-scd.c
@@ -32,113 +32,6 @@
 #include "../common/sexp-parse.h"
 
 
-static gpg_error_t
-ask_for_card (ctrl_t ctrl, const unsigned char *shadow_info,
-              const unsigned char *grip, char **r_kid)
-{
-  char *serialno;
-  char *desc;
-  char *want_sn;
-  int len;
-  gpg_error_t err;
-  char hexgrip[41];
-
-  *r_kid = NULL;
-  bin2hex (grip, 20, hexgrip);
-
-  if (shadow_info)
-    {
-      err = parse_shadow_info (shadow_info, &want_sn, NULL, NULL);
-      if (err)
-        return err;
-    }
-  else
-    want_sn = NULL;
-
-  len = want_sn? strlen (want_sn) : 0;
-  if (len == 32 && !strncmp (want_sn, "D27600012401", 12))
-    {
-      /* This is an OpenPGP card - reformat  */
-      if (!strncmp (want_sn+16, "0006", 4))
-        {
-          /* This is a Yubikey.  Print the s/n as it would be printed
-           * on Yubikey 5. Example: D2760001240100000006120808620000
-           *                                        mmmm^^^^^^^^      */
-          unsigned long sn;
-
-          sn  = atoi_4 (want_sn+20) * 10000;
-          sn += atoi_4 (want_sn+24);
-          snprintf (want_sn, 32, "%lu %03lu %03lu",
-                    (sn/1000000ul), (sn/1000ul % 1000ul), (sn % 1000ul));
-        }
-      else  /* Default is the Zeitcontrol card print format.  */
-        {
-          memmove (want_sn, want_sn+16, 4);
-          want_sn[4] = ' ';
-          memmove (want_sn+5, want_sn+20, 8);
-          want_sn[13] = 0;
-        }
-    }
-  else if (len == 20 && want_sn[19] == '0')
-    {
-      /* We assume that a 20 byte serial number is a standard one
-       * which has the property to have a zero in the last nibble (Due
-       * to BCD representation).  We don't display this '0' because it
-       * may confuse the user.  */
-      want_sn[19] = 0;
-    }
-
-  for (;;)
-    {
-      /* Scan device(s), and check if key for GRIP is available.  */
-      err = agent_card_serialno (ctrl, &serialno, NULL);
-      if (!err)
-        {
-          struct card_key_info_s *keyinfo;
-
-          xfree (serialno);
-          err = agent_card_keyinfo (ctrl, hexgrip, 0, &keyinfo);
-          if (!err)
-            {
-              /* Key for GRIP found, use it directly.  */
-              agent_card_free_keyinfo (keyinfo);
-              xfree (want_sn);
-              if ((*r_kid = xtrystrdup (hexgrip)))
-                return 0;
-              else
-                return gpg_error_from_syserror ();
-            }
-        }
-
-      if (!want_sn)
-        ; /* No shadow info so we can't ask; ERR is already set.  */
-      else if (asprintf (&desc,
-                    "%s:%%0A%%0A"
-                    "  %s",
-                    L_("Please insert the card with serial number"),
-                    want_sn) < 0)
-        {
-          err = out_of_core ();
-        }
-      else
-        {
-          err = agent_get_confirmation (ctrl, desc, NULL, NULL, 0);
-          if (ctrl->pinentry_mode == PINENTRY_MODE_LOOPBACK &&
-              gpg_err_code (err) == GPG_ERR_NO_PIN_ENTRY)
-            err = gpg_error (GPG_ERR_CARD_NOT_PRESENT);
-
-          xfree (desc);
-        }
-
-      if (err)
-        {
-          xfree (want_sn);
-          return err;
-        }
-    }
-}
-
-
 /* Put the DIGEST into an DER encoded container and return it in R_VAL. */
 static int
 encode_md_for_card (const unsigned char *digest, size_t digestlen, int algo,
@@ -426,44 +319,37 @@ getpin_cb (void *opaque, const char *desc_text, const char *info,
 
 
 /* This function is used when a sign operation has been diverted to a
- * smartcard.  DESC_TEXT is the original text for a prompt has send by
- * gpg to gpg-agent.
+ * smartcard.
  *
  * Note: If SHADOW_INFO is NULL the user can't be asked to insert the
  * card, we simply try to use an inserted card with the given keygrip.
  *
  * FIXME: Explain the other args.  */
 int
-divert_pksign (ctrl_t ctrl, const char *desc_text, const unsigned char *grip,
+divert_pksign (ctrl_t ctrl, const unsigned char *grip,
                const unsigned char *digest, size_t digestlen, int algo,
-               const unsigned char *shadow_info, unsigned char **r_sig,
+               unsigned char **r_sig,
                size_t *r_siglen)
 {
   int rc;
-  char *kid;
+  char hexgrip[41];
   size_t siglen;
   unsigned char *sigval = NULL;
 
-  (void)desc_text;
-
-  rc = ask_for_card (ctrl, shadow_info, grip, &kid);
-  if (rc)
-    return rc;
-  /* Note that the KID may be an keyref or a keygrip.  The signing
-   * functions handle both.  */
+  bin2hex (grip, 20, hexgrip);
 
   if (!algo)
     {
       /* This is the PureEdDSA case.  (DIGEST,DIGESTLEN) this the
        * entire data which will be signed.  */
-      rc = agent_card_pksign (ctrl, kid, getpin_cb, ctrl, NULL,
+      rc = agent_card_pksign (ctrl, hexgrip, getpin_cb, ctrl, NULL,
                               0, digest, digestlen, &sigval, &siglen);
     }
   else if (algo == MD_USER_TLS_MD5SHA1)
     {
       int save = ctrl->use_auth_call;
       ctrl->use_auth_call = 1;
-      rc = agent_card_pksign (ctrl, kid, getpin_cb, ctrl, NULL,
+      rc = agent_card_pksign (ctrl, hexgrip, getpin_cb, ctrl, NULL,
                               algo, digest, digestlen, &sigval, &siglen);
       ctrl->use_auth_call = save;
     }
@@ -475,7 +361,7 @@ divert_pksign (ctrl_t ctrl, const char *desc_text, const unsigned char *grip,
       rc = encode_md_for_card (digest, digestlen, algo, &data, &ndata);
       if (!rc)
         {
-          rc = agent_card_pksign (ctrl, kid, getpin_cb, ctrl, NULL,
+          rc = agent_card_pksign (ctrl, hexgrip, getpin_cb, ctrl, NULL,
                                   algo, data, ndata, &sigval, &siglen);
           xfree (data);
         }
@@ -487,8 +373,6 @@ divert_pksign (ctrl_t ctrl, const char *desc_text, const unsigned char *grip,
       *r_siglen = siglen;
     }
 
-  xfree (kid);
-
   return rc;
 }
 
@@ -498,14 +382,13 @@ divert_pksign (ctrl_t ctrl, const char *desc_text, const unsigned char *grip,
    allocated buffer in R_BUF.  The padding information is stored at
    R_PADDING with -1 for not known.  */
 int
-divert_pkdecrypt (ctrl_t ctrl, const char *desc_text,
+divert_pkdecrypt (ctrl_t ctrl,
                   const unsigned char *grip,
                   const unsigned char *cipher,
-                  const unsigned char *shadow_info,
                   char **r_buf, size_t *r_len, int *r_padding)
 {
   int rc;
-  char *kid;
+  char hexgrip[41];
   const unsigned char *s;
   size_t n;
   int depth;
@@ -514,7 +397,7 @@ divert_pkdecrypt (ctrl_t ctrl, const char *desc_text,
   char *plaintext;
   size_t plaintextlen;
 
-  (void)desc_text;
+  bin2hex (grip, 20, hexgrip);
 
   *r_padding = -1;
   s = cipher;
@@ -591,11 +474,7 @@ divert_pkdecrypt (ctrl_t ctrl, const char *desc_text,
   ciphertext = s;
   ciphertextlen = n;
 
-  rc = ask_for_card (ctrl, shadow_info, grip, &kid);
-  if (rc)
-    return rc;
-
-  rc = agent_card_pkdecrypt (ctrl, kid, getpin_cb, ctrl, NULL,
+  rc = agent_card_pkdecrypt (ctrl, hexgrip, getpin_cb, ctrl, NULL,
                              ciphertext, ciphertextlen,
                              &plaintext, &plaintextlen, r_padding);
   if (!rc)
@@ -603,7 +482,6 @@ divert_pkdecrypt (ctrl_t ctrl, const char *desc_text,
       *r_buf = plaintext;
       *r_len = plaintextlen;
     }
-  xfree (kid);
   return rc;
 }
 
diff --git a/agent/divert-tpm2.c b/agent/divert-tpm2.c
index 0741c68..4cae662 100644
--- a/agent/divert-tpm2.c
+++ b/agent/divert-tpm2.c
@@ -13,12 +13,11 @@
 #include "../common/sexp-parse.h"
 
 int
-divert_tpm2_pksign (ctrl_t ctrl, const char *desc_text,
+divert_tpm2_pksign (ctrl_t ctrl,
                     const unsigned char *digest, size_t digestlen, int algo,
                     const unsigned char *shadow_info, unsigned char **r_sig,
                     size_t *r_siglen)
 {
-  (void)desc_text;
   (void)algo;
   return agent_tpm2d_pksign(ctrl, digest, digestlen,
 			    shadow_info, r_sig, r_siglen);
@@ -76,7 +75,7 @@ divert_tpm2_writekey (ctrl_t ctrl, const unsigned char *grip,
 }
 
 int
-divert_tpm2_pkdecrypt (ctrl_t ctrl, const char *desc_text,
+divert_tpm2_pkdecrypt (ctrl_t ctrl,
                        const unsigned char *cipher,
                        const unsigned char *shadow_info,
                        char **r_buf, size_t *r_len, int *r_padding)
@@ -86,8 +85,6 @@ divert_tpm2_pkdecrypt (ctrl_t ctrl, const char *desc_text,
 
   *r_padding = -1;
 
-  (void)desc_text;
-
   s = cipher;
   if (*s != '(')
     return gpg_error (GPG_ERR_INV_SEXP);
diff --git a/agent/findkey.c b/agent/findkey.c
index 45c374d..e0db509 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -33,7 +33,6 @@
 #include "agent.h"
 #include "../common/i18n.h"
 #include "../common/ssh-utils.h"
-#include "../common/name-value.h"
 
 #ifndef O_BINARY
 #define O_BINARY 0
@@ -173,6 +172,8 @@ write_extended_private_key (char *fname, estream_t fp, int update, int newkey,
     goto leave;
 
   err = nvc_write (pk, fp);
+  if (!err)
+    err = es_fflush (fp);
   if (err)
     {
       log_error ("error writing '%s': %s\n", fname, gpg_strerror (err));
@@ -339,6 +340,59 @@ agent_write_private_key (const unsigned char *grip,
 }
 
 
+gpg_error_t
+agent_update_private_key (const unsigned char *grip, nvc_t pk)
+{
+  char *fname, *fname0;
+  estream_t fp;
+  char hexgrip[40+8+1];
+  gpg_error_t err;
+
+  bin2hex (grip, 20, hexgrip);
+  strcpy (hexgrip+40, ".key.tmp");
+
+  fname = make_filename (gnupg_homedir (), GNUPG_PRIVATE_KEYS_DIR,
+                         hexgrip, NULL);
+  fname0 = xstrdup (fname);
+  if (!fname0)
+    {
+      err = gpg_error_from_syserror ();
+      xfree (fname);
+      return err;
+    }
+  fname0[strlen (fname)-4] = 0;
+
+  fp = es_fopen (fname, "wbx,mode=-rw");
+  if (!fp)
+    {
+      err = gpg_error_from_syserror ();
+
+      log_error ("can't create '%s': %s\n", fname, gpg_strerror (err));
+      xfree (fname);
+      return err;
+    }
+
+  err = nvc_write (pk, fp);
+  if (err)
+    log_error ("error writing '%s': %s\n", fname, gpg_strerror (err));
+
+  es_fclose (fp);
+
+#ifdef HAVE_W32_SYSTEM
+  /* No atomic mv on W32 systems.  */
+  gnupg_remove (fname0);
+#endif
+  if (rename (fname, fname0))
+    {
+      err = gpg_error_from_errno (errno);
+      log_error (_("error renaming '%s' to '%s': %s\n"),
+                 fname, fname0, strerror (errno));
+    }
+
+  xfree (fname);
+  return err;
+}
+
 /* Callback function to try the unprotection from the passphrase query
    code. */
 static gpg_error_t
@@ -961,8 +1015,137 @@ remove_key_file (const unsigned char *grip)
 }
 
 
+/*
+ * Prompt a user the card insertion, when it's not available yet.
+ */
+static gpg_error_t
+prompt_for_card (ctrl_t ctrl, const unsigned char *grip,
+                 nvc_t keymeta, const unsigned char *shadow_info)
+{
+  char *serialno;
+  char *desc;
+  char *want_sn = NULL;
+  int len;
+  gpg_error_t err;
+  char hexgrip[41];
+  char *comment_buffer = NULL;
+  const char *comment = NULL;
+  int refuse_prompt = 0;
+
+  bin2hex (grip, 20, hexgrip);
+
+  if (keymeta)
+    {
+      const char *p;
+
+      if ((p = nvc_get_string (keymeta, "Prompt:")) && !strcmp (p, "no"))
+        refuse_prompt = 1;
+
+      if ((p = nvc_get_string (keymeta, "Label:")))
+        {
+          if (strchr (p, '\n')
+              && (comment_buffer = linefeed_to_percent0A (p)))
+            comment = comment_buffer;
+          else
+            comment = p;
+        }
+    }
+
+  err = parse_shadow_info (shadow_info, &want_sn, NULL, NULL);
+  if (err)
+    return err;
+
+  len = want_sn? strlen (want_sn) : 0;
+  if (len == 32 && !strncmp (want_sn, "D27600012401", 12))
+    {
+      /* This is an OpenPGP card - reformat  */
+      if (!strncmp (want_sn+16, "0006", 4))
+        {
+          /* This is a Yubikey.  Print the s/n as it would be printed
+           * on Yubikey 5. Example: D2760001240100000006120808620000
+           *                                        mmmm^^^^^^^^      */
+          unsigned long sn;
+
+          sn  = atoi_4 (want_sn+20) * 10000;
+          sn += atoi_4 (want_sn+24);
+          snprintf (want_sn, 32, "%lu %03lu %03lu",
+                    (sn/1000000ul), (sn/1000ul % 1000ul), (sn % 1000ul));
+        }
+      else  /* Default is the Zeitcontrol card print format.  */
+        {
+          memmove (want_sn, want_sn+16, 4);
+          want_sn[4] = ' ';
+          memmove (want_sn+5, want_sn+20, 8);
+          want_sn[13] = 0;
+        }
+    }
+  else if (len == 20 && want_sn[19] == '0')
+    {
+      /* We assume that a 20 byte serial number is a standard one
+       * which has the property to have a zero in the last nibble (Due
+       * to BCD representation).  We don't display this '0' because it
+       * may confuse the user.  */
+      want_sn[19] = 0;
+    }
+
+  for (;;)
+    {
+      /* Scan device(s), and check if key for GRIP is available.  */
+      err = agent_card_serialno (ctrl, &serialno, NULL);
+      if (!err)
+        {
+          struct card_key_info_s *keyinfo;
+
+          xfree (serialno);
+          err = agent_card_keyinfo (ctrl, hexgrip, 0, &keyinfo);
+          if (!err)
+            {
+              /* Key for GRIP found, use it.  */
+              agent_card_free_keyinfo (keyinfo);
+              break;
+            }
+        }
+
+      /* Card is not available.  Prompt the insertion.  */
+      if (refuse_prompt)
+        {
+          err = gpg_error (GPG_ERR_UNUSABLE_SECKEY);
+          break;
+        }
+
+      if (asprintf (&desc,
+                    "%s:%%0A%%0A"
+                    "  %s%%0A"
+                    "  %s",
+                    L_("Please insert the card with serial number"),
+                    want_sn ? want_sn : "",
+                    comment? comment:"") < 0)
+        err = out_of_core ();
+      else
+        {
+          err = agent_get_confirmation (ctrl, desc, NULL, NULL, 0);
+          if (ctrl->pinentry_mode == PINENTRY_MODE_LOOPBACK &&
+              gpg_err_code (err) == GPG_ERR_NO_PIN_ENTRY)
+            err = gpg_error (GPG_ERR_CARD_NOT_PRESENT);
+
+          xfree (desc);
+        }
+
+      if (err)
+        break;
+    }
+
+  xfree (want_sn);
+  gcry_free (comment_buffer);
+  return err;
+}
+
+
 /* Return the secret key as an S-Exp in RESULT after locating it using
-   the GRIP.  If the operation shall be diverted to a token, an
+   the GRIP.  Caller should set GRIP=NULL, when a key in a file is
+   intended to be used for cryptographic operation.  In this case,
+   CTRL->keygrip is used to locate the file, and it may ask a user for
+   confirmation.  If the operation shall be diverted to a token, an
    allocated S-expression with the shadow_info part from the file is
    stored at SHADOW_INFO; if not NULL will be stored at SHADOW_INFO.
    CACHE_MODE defines now the cache shall be used.  DESC_TEXT may be
@@ -999,13 +1182,10 @@ agent_key_from_file (ctrl_t ctrl, const char *cache_nonce,
   if (r_timestamp)
     *r_timestamp = (time_t)(-1);
 
-  err = read_key_file (grip, &s_skey, &keymeta);
-  if (err)
-    {
-      if (gpg_err_code (err) == GPG_ERR_ENOENT)
-        err = gpg_error (GPG_ERR_NO_SECKEY);
-      return err;
-    }
+  if (!grip && !ctrl->have_keygrip)
+    return gpg_error (GPG_ERR_NO_SECKEY);
+
+  err = read_key_file (grip? grip : ctrl->keygrip, &s_skey, &keymeta);
 
   /* For use with the protection functions we also need the key as an
      canonical encoded S-expression in a buffer.  Create this buffer
@@ -1026,6 +1206,45 @@ agent_key_from_file (ctrl_t ctrl, const char *cache_nonce,
         *r_timestamp = isotime2epoch (created);
     }
 
+  if (!grip && keymeta)
+    {
+      const char *ask_confirmation = nvc_get_string (keymeta, "Confirm:");
+
+      if (ask_confirmation
+          && ((!strcmp (ask_confirmation, "restricted") && ctrl->restricted)
+              || !strcmp (ask_confirmation, "yes")))
+        {
+          char hexgrip[40+4+1];
+          char *prompt;
+          char *comment_buffer = NULL;
+          const char *comment = NULL;
+
+          bin2hex (ctrl->keygrip, 20, hexgrip);
+
+          if ((comment = nvc_get_string (keymeta, "Label:")))
+            {
+              if (strchr (comment, '\n')
+                  && (comment_buffer = linefeed_to_percent0A (comment)))
+                comment = comment_buffer;
+            }
+
+          prompt = xtryasprintf (L_("Requested the use of key%%0A"
+                                    "  %s%%0A"
+                                    "  %s%%0A"
+                                    "Do you want to allow this?"),
+                                 hexgrip, comment? comment:"");
+
+          gcry_free (comment_buffer);
+
+          err = agent_get_confirmation (ctrl, prompt,
+                                        L_("Allow"), L_("Deny"), 0);
+          xfree (prompt);
+
+          if (err)
+            return err;
+        }
+    }
+
   switch (agent_private_key_type (buf))
     {
     case PRIVATE_KEY_CLEAR:
@@ -1087,14 +1306,15 @@ agent_key_from_file (ctrl_t ctrl, const char *cache_nonce,
                                           &desc_text_final);
         gcry_free (comment_buffer);
 
-	if (!err)
-	  {
-	    err = unprotect (ctrl, cache_nonce, desc_text_final, &buf, grip,
-                            cache_mode, lookup_ttl, r_passphrase);
-	    if (err)
-	      log_error ("failed to unprotect the secret key: %s\n",
-			 gpg_strerror (err));
-	  }
+        if (!err)
+          {
+            err = unprotect (ctrl, cache_nonce, desc_text_final, &buf,
+                             grip? grip : ctrl->keygrip,
+                             cache_mode, lookup_ttl, r_passphrase);
+            if (err)
+              log_error ("failed to unprotect the secret key: %s\n",
+                         gpg_strerror (err));
+          }
 
 	xfree (desc_text_final);
       }
@@ -1103,24 +1323,37 @@ agent_key_from_file (ctrl_t ctrl, const char *cache_nonce,
       if (shadow_info)
         {
           const unsigned char *s;
+          unsigned char *shadow_type;
           size_t n;
 
-          err = agent_get_shadow_info (buf, &s);
+          err = agent_get_shadow_info_type (buf, &s, &shadow_type);
           if (!err)
             {
               n = gcry_sexp_canon_len (s, 0, NULL,NULL);
               log_assert (n);
               *shadow_info = xtrymalloc (n);
               if (!*shadow_info)
-                err = out_of_core ();
+                {
+                  err = out_of_core ();
+                  goto shadow_error;
+                }
               else
                 {
                   memcpy (*shadow_info, s, n);
-                  err = 0;
+                  /*
+                   * When it's a key on card (not on tpm2), maks sure
+                   * it's available.
+                   */
+                  if (strcmp (shadow_type, "t1-v1") == 0 && !grip)
+                    err = prompt_for_card (ctrl, ctrl->keygrip,
+                                           keymeta, *shadow_info);
                 }
             }
-          if (err)
+          else
+          shadow_error:
             log_error ("get_shadow_info failed: %s\n", gpg_strerror (err));
+
+          xfree (shadow_type);
         }
       else
         err = gpg_error (GPG_ERR_UNUSABLE_SECKEY);
@@ -1170,7 +1403,7 @@ agent_key_from_file (ctrl_t ctrl, const char *cache_nonce,
    failure an error code is returned and NULL stored at RESULT. */
 gpg_error_t
 agent_raw_key_from_file (ctrl_t ctrl, const unsigned char *grip,
-                         gcry_sexp_t *result)
+                         gcry_sexp_t *result, nvc_t *r_keymeta)
 {
   gpg_error_t err;
   gcry_sexp_t s_skey;
@@ -1179,7 +1412,7 @@ agent_raw_key_from_file (ctrl_t ctrl, const unsigned char *grip,
 
   *result = NULL;
 
-  err = read_key_file (grip, &s_skey, NULL);
+  err = read_key_file (grip, &s_skey, r_keymeta);
   if (!err)
     *result = s_skey;
   return err;
@@ -1190,14 +1423,14 @@ agent_raw_key_from_file (ctrl_t ctrl, const unsigned char *grip,
    at RESULT.  This function extracts the public key from the private
    key database.  On failure an error code is returned and NULL stored
    at RESULT. */
-gpg_error_t
-agent_public_key_from_file (ctrl_t ctrl,
-                            const unsigned char *grip,
-                            gcry_sexp_t *result)
+static gpg_error_t
+public_key_from_file (ctrl_t ctrl, const unsigned char *grip,
+                      gcry_sexp_t *result, int for_ssh)
 {
   gpg_error_t err;
   int i, idx;
   gcry_sexp_t s_skey;
+  nvc_t keymeta = NULL;
   const char *algoname, *elems;
   int npkey;
   gcry_mpi_t array[10];
@@ -1219,10 +1452,30 @@ agent_public_key_from_file (ctrl_t ctrl,
 
   *result = NULL;
 
-  err = read_key_file (grip, &s_skey, NULL);
+  err = read_key_file (grip, &s_skey, for_ssh? &keymeta : NULL);
   if (err)
     return err;
 
+  if (for_ssh)
+    {
+      /* Use-for-ssh: yes */
+      const char *p;
+      int is_ssh = 0;
+
+      if (keymeta == NULL)
+        return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
+
+      if ((p = nvc_get_string (keymeta, "Use-for-ssh:"))
+          && !strcmp (p, "yes"))
+        is_ssh = 1;
+
+      nvc_release (keymeta);
+      keymeta = NULL;
+
+      if (!is_ssh)
+        return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
+    }
+
   for (i=0; i < DIM (array); i++)
     array[i] = NULL;
 
@@ -1311,6 +1564,22 @@ agent_public_key_from_file (ctrl_t ctrl,
   return err;
 }
 
+gpg_error_t
+agent_public_key_from_file (ctrl_t ctrl,
+                            const unsigned char *grip,
+                            gcry_sexp_t *result)
+{
+  return public_key_from_file (ctrl, grip, result, 0);
+}
+
+gpg_error_t
+agent_ssh_key_from_file (ctrl_t ctrl,
+                         const unsigned char *grip,
+                         gcry_sexp_t *result)
+{
+  return public_key_from_file (ctrl, grip, result, 1);
+}
+
 
 /* Check whether the secret key identified by GRIP is available.
    Returns 0 is the key is available.  */
diff --git a/agent/genkey.c b/agent/genkey.c
index 0c91ab4..fc6ce0a 100644
--- a/agent/genkey.c
+++ b/agent/genkey.c
@@ -97,7 +97,7 @@ do_check_passphrase_pattern (ctrl_t ctrl, const char *pw, unsigned int flags)
 {
   gpg_error_t err = 0;
   const char *pgmname = gnupg_module_name (GNUPG_MODULE_NAME_CHECK_PATTERN);
-  FILE *infp;
+  estream_t stream_to_check_pattern = NULL;
   const char *argv[10];
   pid_t pid;
   int result, i;
@@ -135,27 +135,6 @@ do_check_passphrase_pattern (ctrl_t ctrl, const char *pw, unsigned int flags)
       return 1; /* Do not pass the check.  */
     }
 
-  infp = gnupg_tmpfile ();
-  if (!infp)
-    {
-      err = gpg_error_from_syserror ();
-      log_error (_("error creating temporary file: %s\n"), gpg_strerror (err));
-      xfree (patternfname);
-      return 1; /* Error - assume password should not be used.  */
-    }
-
-  if (fwrite (pw, strlen (pw), 1, infp) != 1)
-    {
-      err = gpg_error_from_syserror ();
-      log_error (_("error writing to temporary file: %s\n"),
-                 gpg_strerror (err));
-      fclose (infp);
-      xfree (patternfname);
-      return 1; /* Error - assume password should not be used.  */
-    }
-  fseek (infp, 0, SEEK_SET);
-  clearerr (infp);
-
   i = 0;
   argv[i++] = "--null";
   argv[i++] = "--",
@@ -163,21 +142,27 @@ 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_fd (pgmname, argv, fileno (infp), -1, -1, &pid))
+  if (gnupg_spawn_process (pgmname, argv, NULL, NULL, 0,
+                           &stream_to_check_pattern, NULL, NULL, &pid))
     result = 1; /* Execute error - assume password should no be used.  */
-  else if (gnupg_wait_process (pgmname, pid, 1, NULL))
-    result = 1; /* Helper returned an error - probably a match.  */
   else
-    result = 0; /* Success; i.e. no match.  */
-  gnupg_release_process (pid);
-
-  /* Overwrite our temporary file. */
-  fseek (infp, 0, SEEK_SET);
-  clearerr (infp);
-  for (i=((strlen (pw)+99)/100)*100; i > 0; i--)
-    putc ('\xff', infp);
-  fflush (infp);
-  fclose (infp);
+    {
+      es_set_binary (stream_to_check_pattern);
+      if (es_fwrite (pw, strlen (pw), 1, stream_to_check_pattern) != 1)
+        {
+          err = gpg_error_from_syserror ();
+          log_error (_("error writing to pipe: %s\n"), gpg_strerror (err));
+          result = 1; /* Error - assume password should not be used.  */
+        }
+      else
+        es_fflush (stream_to_check_pattern);
+      es_fclose (stream_to_check_pattern);
+      if (gnupg_wait_process (pgmname, pid, 1, NULL))
+        result = 1; /* Helper returned an error - probably a match.  */
+      else
+        result = 0; /* Success; i.e. no match.  */
+      gnupg_release_process (pid);
+    }
 
   xfree (patternfname);
   return result;
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 2690c08..7194e02 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -128,6 +128,8 @@ enum cmd_and_opt_values
   oIgnoreCacheForSigning,
   oAllowMarkTrusted,
   oNoAllowMarkTrusted,
+  oNoUserTrustlist,
+  oSysTrustlistName,
   oAllowPresetPassphrase,
   oAllowLoopbackPinentry,
   oNoAllowLoopbackPinentry,
@@ -167,7 +169,7 @@ static gpgrt_opt_t opts[] = {
   ARGPARSE_s_n (oDaemon,  "daemon", N_("run in daemon mode (background)")),
   ARGPARSE_s_n (oServer,  "server", N_("run in server mode (foreground)")),
 #ifndef HAVE_W32_SYSTEM
-  ARGPARSE_s_n (oSupervised,  "supervised", N_("run in supervised mode")),
+  ARGPARSE_s_n (oSupervised,  "supervised", "@"),
 #endif
   ARGPARSE_s_n (oNoDetach,  "no-detach", N_("do not detach from the console")),
   ARGPARSE_s_n (oSh,	  "sh",        N_("sh-style command output")),
@@ -251,6 +253,8 @@ static gpgrt_opt_t opts[] = {
   ARGPARSE_s_n (oNoAllowMarkTrusted, "no-allow-mark-trusted",
                 /* */    N_("disallow clients to mark keys as \"trusted\"")),
   ARGPARSE_s_n (oAllowMarkTrusted,   "allow-mark-trusted", "@"),
+  ARGPARSE_s_n (oNoUserTrustlist,    "no-user-trustlist", "@"),
+  ARGPARSE_s_s (oSysTrustlistName,   "sys-trustlist-name", "@"),
   ARGPARSE_s_n (oAllowPresetPassphrase, "allow-preset-passphrase",
                 /* */                    N_("allow presetting passphrase")),
   ARGPARSE_s_u (oS2KCount, "s2k-count", "@"),
@@ -333,17 +337,12 @@ static struct debug_flags_s debug_flags [] =
 
 /* The timer tick used for housekeeping stuff.  Note that on Windows
  * we use a SetWaitableTimer seems to signal earlier than about 2
- * seconds.  Thus we use 4 seconds on all platforms except for
- * Windowsce.  CHECK_OWN_SOCKET_INTERVAL defines how often we check
+ * seconds.  Thus we use 4 seconds on all platforms.
+ * CHECK_OWN_SOCKET_INTERVAL defines how often we check
  * our own socket in standard socket mode.  If that value is 0 we
  * don't check at all.  All values are in seconds. */
-#if defined(HAVE_W32CE_SYSTEM)
-# define TIMERTICK_INTERVAL         (60)
-# define CHECK_OWN_SOCKET_INTERVAL   (0)  /* Never */
-#else
-# define TIMERTICK_INTERVAL          (4)
-# define CHECK_OWN_SOCKET_INTERVAL  (60)
-#endif
+#define TIMERTICK_INTERVAL          (4)
+#define CHECK_OWN_SOCKET_INTERVAL  (60)
 
 
 /* Flag indicating that the ssh-agent subsystem has been enabled.  */
@@ -876,6 +875,7 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread)
       opt.enable_extended_key_format = 1;
       opt.ignore_cache_for_signing = 0;
       opt.allow_mark_trusted = 1;
+      opt.sys_trustlist_name = NULL;
       opt.allow_external_cache = 1;
       opt.allow_loopback_pinentry = 1;
       opt.allow_emacs_pinentry = 0;
@@ -973,6 +973,8 @@ parse_rereadable_options (gpgrt_argparse_t *pargs, int reread)
 
     case oAllowMarkTrusted: opt.allow_mark_trusted = 1; break;
     case oNoAllowMarkTrusted: opt.allow_mark_trusted = 0; break;
+    case oNoUserTrustlist: opt.no_user_trustlist = 1; break;
+    case oSysTrustlistName: opt.sys_trustlist_name = pargs->r.ret_str; break;
 
     case oAllowPresetPassphrase: opt.allow_preset_passphrase = 1; break;
 
@@ -1018,6 +1020,11 @@ finalize_rereadable_options (void)
   /* Hack to allow --grab to override --no-grab.  */
   if ((opt.no_grab & 2))
     opt.no_grab = 0;
+
+  /* With --no-user-trustlist it does not make sense to allow the mark
+   * trusted feature.  */
+  if (opt.no_user_trustlist)
+    opt.allow_mark_trusted = 0;
 }
 
 
@@ -1378,6 +1385,9 @@ main (int argc, char **argv)
       agent_exit (0);
     }
 
+  if (is_supervised && !opt.quiet)
+    log_info(_("WARNING: \"%s\" is a deprecated option\n"), "--supervised");
+
   if (is_supervised)
     ;
   else if (!opt.extra_socket)
@@ -2102,7 +2112,7 @@ get_agent_active_connection_count (void)
 /* Under W32, this function returns the handle of the scdaemon
    notification event.  Calling it the first time creates that
    event.  */
-#if defined(HAVE_W32_SYSTEM) && !defined(HAVE_W32CE_SYSTEM)
+#if defined(HAVE_W32_SYSTEM)
 void *
 get_agent_daemon_notify_event (void)
 {
@@ -2139,7 +2149,7 @@ get_agent_daemon_notify_event (void)
 
   return the_event;
 }
-#endif /*HAVE_W32_SYSTEM && !HAVE_W32CE_SYSTEM*/
+#endif /*HAVE_W32_SYSTEM*/
 
 
 
@@ -2227,8 +2237,8 @@ create_server_socket (char *name, int primary, int cygwin,
   len = SUN_LEN (unaddr);
   rc = assuan_sock_bind (fd, addr, len);
 
-  /* Our error code mapping on W32CE returns EEXIST thus we also test
-     for this. */
+  /* At least our error code mapping on Windows-CE used to return
+   * EEXIST thus we better test for this on Windows . */
   if (rc == -1
       && (errno == EADDRINUSE
 #ifdef HAVE_W32_SYSTEM
@@ -2892,14 +2902,8 @@ handle_connections (gnupg_fd_t listen_fd,
   npth_sigev_add (SIGTERM);
   npth_sigev_fini ();
 #else
-# ifdef HAVE_W32CE_SYSTEM
-  /* Use a dummy event. */
-  sigs = 0;
-  ev = pth_event (PTH_EVENT_SIGS, &sigs, &signo);
-# else
   events[0] = get_agent_daemon_notify_event ();
   events[1] = INVALID_HANDLE_VALUE;
-# endif
 #endif
 
   if (disable_check_own_socket)
diff --git a/agent/pkdecrypt.c b/agent/pkdecrypt.c
index cf6c149..82818f8 100644
--- a/agent/pkdecrypt.c
+++ b/agent/pkdecrypt.c
@@ -68,7 +68,7 @@ agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
       log_printhex (ciphertext, ciphertextlen, "cipher: ");
     }
   err = agent_key_from_file (ctrl, NULL, desc_text,
-                             ctrl->keygrip, &shadow_info,
+                             NULL, &shadow_info,
                              CACHE_MODE_NORMAL, NULL, &s_skey, NULL, NULL);
   if (gpg_err_code (err) == GPG_ERR_NO_SECKEY)
     no_shadow_info = 1;
@@ -89,11 +89,11 @@ agent_pkdecrypt (ctrl_t ctrl, const char *desc_text,
         }
 
       if (agent_is_tpm2_key (s_skey))
-	err = divert_tpm2_pkdecrypt (ctrl, desc_text, ciphertext, shadow_info,
+	err = divert_tpm2_pkdecrypt (ctrl, ciphertext, shadow_info,
                                      &buf, &len, r_padding);
       else
-        err = divert_pkdecrypt (ctrl, desc_text, ctrl->keygrip, ciphertext,
-                                shadow_info, &buf, &len, r_padding);
+        err = divert_pkdecrypt (ctrl, ctrl->keygrip, ciphertext,
+                                &buf, &len, r_padding);
       if (err)
         {
           log_error ("smartcard decryption failed: %s\n", gpg_strerror (err));
diff --git a/agent/pksign.c b/agent/pksign.c
index 170dc96..dfed0e3 100644
--- a/agent/pksign.c
+++ b/agent/pksign.c
@@ -314,7 +314,7 @@ agent_pksign_do (ctrl_t ctrl, const char *cache_nonce,
   if (!ctrl->have_keygrip)
     return gpg_error (GPG_ERR_NO_SECKEY);
 
-  err = agent_key_from_file (ctrl, cache_nonce, desc_text, ctrl->keygrip,
+  err = agent_key_from_file (ctrl, cache_nonce, desc_text, NULL,
                              &shadow_info, cache_mode, lookup_ttl,
                              &s_skey, NULL, NULL);
   if (gpg_err_code (err) == GPG_ERR_NO_SECKEY)
@@ -392,23 +392,17 @@ agent_pksign_do (ctrl_t ctrl, const char *cache_nonce,
         }
 
       {
-        char *desc2 = NULL;
-
-        if (desc_text)
-          agent_modify_description (desc_text, NULL, s_pkey, &desc2);
-
 	if (agent_is_tpm2_key (s_skey))
-	  err = divert_tpm2_pksign (ctrl, desc2? desc2 : desc_text,
+	  err = divert_tpm2_pksign (ctrl,
 				    data, datalen,
 				    ctrl->digest.algo,
 				    shadow_info, &buf, &len);
 	else
-	  err = divert_pksign (ctrl, desc2? desc2 : desc_text,
+	  err = divert_pksign (ctrl,
 			       ctrl->keygrip,
 			       data, datalen,
 			       ctrl->digest.algo,
-			       shadow_info, &buf, &len);
-        xfree (desc2);
+			       &buf, &len);
       }
       if (err)
         {
diff --git a/agent/protect.c b/agent/protect.c
index 30ee134..bc44fe1 100644
--- a/agent/protect.c
+++ b/agent/protect.c
@@ -122,15 +122,9 @@ static void
 calibrate_get_time (struct calibrate_time_s *data)
 {
 #ifdef HAVE_W32_SYSTEM
-# ifdef HAVE_W32CE_SYSTEM
-  GetThreadTimes (GetCurrentThread (),
-                  &data->creation_time, &data->exit_time,
-                  &data->kernel_time, &data->user_time);
-# else
   GetProcessTimes (GetCurrentProcess (),
                    &data->creation_time, &data->exit_time,
                    &data->kernel_time, &data->user_time);
-# endif
 #elif defined (USE_CLOCK_GETTIME)
   struct timespec tmp;
 
diff --git a/agent/trustlist.c b/agent/trustlist.c
index 53d759f..250fcf2 100644
--- a/agent/trustlist.c
+++ b/agent/trustlist.c
@@ -128,6 +128,24 @@ clear_trusttable (void)
 }
 
 
+/* Return the name of the system trustlist.  Caller must free.  */
+static char *
+make_sys_trustlist_name (void)
+{
+  if (opt.sys_trustlist_name
+      && (strchr (opt.sys_trustlist_name, '/')
+          || strchr (opt.sys_trustlist_name, '\\')
+          || (*opt.sys_trustlist_name == '~'
+              && opt.sys_trustlist_name[1] == '/')))
+    return make_absfilename (opt.sys_trustlist_name, NULL);
+  else
+    return make_filename (gnupg_sysconfdir (),
+                          (opt.sys_trustlist_name ?
+                           opt.sys_trustlist_name : "trustlist.txt"),
+                          NULL);
+}
+
+
 static gpg_error_t
 read_one_trustfile (const char *fname, int systrust,
                     trustitem_t **addr_of_table,
@@ -196,7 +214,7 @@ read_one_trustfile (const char *fname, int systrust,
             }
           /* fixme: Should check for trailing garbage.  */
 
-          etcname = make_filename (gnupg_sysconfdir (), "trustlist.txt", NULL);
+          etcname = make_sys_trustlist_name ();
           if ( !strcmp (etcname, fname) ) /* Same file. */
             log_info (_("statement \"%s\" ignored in '%s', line %d\n"),
                       "include-default", fname, lnr);
@@ -348,17 +366,24 @@ read_trustfiles (void)
     return gpg_error_from_syserror ();
   tableidx = 0;
 
-  fname = make_filename_try (gnupg_homedir (), "trustlist.txt", NULL);
-  if (!fname)
+  if (opt.no_user_trustlist)
+    fname = NULL;
+  else
     {
-      err = gpg_error_from_syserror ();
-      xfree (table);
-      return err;
+      fname = make_filename_try (gnupg_homedir (), "trustlist.txt", NULL);
+      if (!fname)
+        {
+          err = gpg_error_from_syserror ();
+          xfree (table);
+          return err;
+        }
     }
 
-  if ((ec = gnupg_access (fname, F_OK)))
+  if (!fname || (ec = gnupg_access (fname, F_OK)))
     {
-      if ( ec == GPG_ERR_ENOENT )
+      if (!fname)
+        ; /* --no-user-trustlist active.  */
+      else if ( ec == GPG_ERR_ENOENT )
         ; /* Silently ignore a non-existing trustfile.  */
       else
         {
@@ -366,7 +391,7 @@ read_trustfiles (void)
           log_error (_("error opening '%s': %s\n"), fname, gpg_strerror (err));
         }
       xfree (fname);
-      fname = make_filename (gnupg_sysconfdir (), "trustlist.txt", NULL);
+      fname = make_sys_trustlist_name ();
       systrust = 1;
     }
   err = read_one_trustfile (fname, systrust, &table, &tablesize, &tableidx);
diff --git a/common/call-gpg.c b/common/call-gpg.c
index c1472e9..a4723ca 100644
--- a/common/call-gpg.c
+++ b/common/call-gpg.c
@@ -106,8 +106,6 @@ start_gpg (ctrl_t ctrl, const char *gpg_program, strlist_t gpg_arguments,
   argv[i++] = NULL;
 
   i = 0;
-  if (log_get_fd () != -1)
-    no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
   no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
   if (input_fd != -1)
     no_close_list[i++] = assuan_fd_from_posix_fd (input_fd);
diff --git a/common/dynload.h b/common/dynload.h
index f6ec875..6ac7b4e 100644
--- a/common/dynload.h
+++ b/common/dynload.h
@@ -45,14 +45,9 @@ static inline void *
 dlopen (const char *name, int flag)
 {
   void *hd;
-#ifdef HAVE_W32CE_SYSTEM
-  wchar_t *wname = utf8_to_wchar (name);
-  hd = wname? LoadLibrary (wname) : NULL;
-  xfree (wname);
-#else
-  hd = LoadLibrary (name);
-#endif
   (void)flag;
+
+  hd = LoadLibraryEx (name, NULL, 0);
   return hd;
 }
 
@@ -61,13 +56,7 @@ dlsym (void *hd, const char *sym)
 {
   if (hd && sym)
     {
-#ifdef HAVE_W32CE_SYSTEM
-      wchar_t *wsym = utf8_to_wchar (sym);
-      void *fnc = wsym? GetProcAddress (hd, wsym) : NULL;
-      xfree (wsym);
-#else
       void *fnc = GetProcAddress (hd, sym);
-#endif
       if (!fnc)
         return NULL;
       return fnc;
diff --git a/common/init.c b/common/init.c
index b9f05f3..269119f 100644
--- a/common/init.c
+++ b/common/init.c
@@ -35,9 +35,6 @@
 # endif
 # include <windows.h>
 #endif
-#ifdef HAVE_W32CE_SYSTEM
-# include <assuan.h> /* For _assuan_w32ce_finish_pipe. */
-#endif
 
 #include <gcrypt.h>
 #include "util.h"
@@ -69,16 +66,6 @@ static mem_cleanup_item_t mem_cleanup_list;
 gpg_err_source_t default_errsource = 0;
 
 
-#ifdef HAVE_W32CE_SYSTEM
-static void parse_std_file_handles (int *argcp, char ***argvp);
-static void
-sleep_on_exit (void)
-{
-  /* The sshd on CE swallows some of the command output.  Sleeping a
-     while usually helps.  */
-  Sleep (400);
-}
-#endif /*HAVE_W32CE_SYSTEM*/
 
 #if HAVE_W32_SYSTEM
 static void prepare_w32_commandline (int *argcp, char ***argvp);
@@ -178,14 +165,6 @@ _init_common_subsystems (gpg_err_source_t errsource, int *argcp, char ***argvp)
   }
 #endif
 
-#ifdef HAVE_W32CE_SYSTEM
-  /* Register the sleep exit function before the estream init so that
-     the sleep will be called after the estream registered atexit
-     function which flushes the left open estream streams and in
-     particular es_stdout.  */
-  atexit (sleep_on_exit);
-#endif
-
   if (!gcry_check_version (NEED_LIBGCRYPT_VERSION))
     {
       log_fatal (_("%s is too old (need %s, have %s)\n"), "libgcrypt",
@@ -196,11 +175,6 @@ _init_common_subsystems (gpg_err_source_t errsource, int *argcp, char ***argvp)
   gpgrt_init ();
   gpgrt_set_alloc_func (gcry_realloc);
 
-#ifdef HAVE_W32CE_SYSTEM
-  /* Special hack for Windows CE: We extract some options from arg
-     to setup the standard handles.  */
-  parse_std_file_handles (argcp, argvp);
-#endif
 
 #ifdef HAVE_W32_SYSTEM
   /* We want gettext to always output UTF-8 and we put the console in
@@ -251,77 +225,6 @@ _init_common_subsystems (gpg_err_source_t errsource, int *argcp, char ***argvp)
 
 
 
-/* WindowsCE uses a very strange way of handling the standard streams.
-   There is a function SetStdioPath to associate a standard stream
-   with a file or a device but what we really want is to use pipes as
-   standard streams.  Despite that we implement pipes using a device,
-   we would have some limitations on the number of open pipes due to
-   the 3 character limit of device file name.  Thus we don't take this
-   path.  Another option would be to install a file system driver with
-   support for pipes; this would allow us to get rid of the device
-   name length limitation.  However, with GnuPG we can get away be
-   redefining the standard streams and passing the handles to be used
-   on the command line.  This has also the advantage that it makes
-   creating a process much easier and does not require the
-   SetStdioPath set and restore game.  The caller needs to pass the
-   rendezvous ids using up to three options:
-
-     -&S0=<rvid> -&S1=<rvid> -&S2=<rvid>
-
-   They are all optional but they must be the first arguments on the
-   command line.  Parsing stops as soon as an invalid option is found.
-   These rendezvous ids are then used to finish the pipe creation.*/
-#ifdef HAVE_W32CE_SYSTEM
-static void
-parse_std_file_handles (int *argcp, char ***argvp)
-{
-  int argc = *argcp;
-  char **argv = *argvp;
-  const char *s;
-  assuan_fd_t fd;
-  int i;
-  int fixup = 0;
-
-  if (!argc)
-    return;
-
-  for (argc--, argv++; argc; argc--, argv++)
-    {
-      s = *argv;
-      if (*s == '-' && s[1] == '&' && s[2] == 'S'
-          && (s[3] == '0' || s[3] == '1' || s[3] == '2')
-          && s[4] == '='
-          && (strchr ("-01234567890", s[5]) || !strcmp (s+5, "null")))
-        {
-          if (s[5] == 'n')
-            fd = ASSUAN_INVALID_FD;
-          else
-            fd = _assuan_w32ce_finish_pipe (atoi (s+5), s[3] != '0');
-          _es_set_std_fd (s[3] - '0', (int)fd);
-          fixup++;
-        }
-      else
-        break;
-    }
-
-  if (fixup)
-    {
-      argc = *argcp;
-      argc -= fixup;
-      *argcp = argc;
-
-      argv = *argvp;
-      for (i=1; i < argc; i++)
-        argv[i] = argv[i + fixup];
-      for (; i < argc + fixup; i++)
-        argv[i] = NULL;
-    }
-
-
-}
-#endif /*HAVE_W32CE_SYSTEM*/
-
-
 /* For Windows we need to parse the command line so that we can
  * provide an UTF-8 encoded argv.  If there is any Unicode character
  * we return a new array but if there is no Unicode character we do
diff --git a/common/iobuf.c b/common/iobuf.c
index 8ec4c86..c88d679 100644
--- a/common/iobuf.c
+++ b/common/iobuf.c
@@ -78,13 +78,8 @@ static unsigned int iobuf_buffer_size = DEFAULT_IOBUF_BUFFER_SIZE;
 
 
 #ifdef HAVE_W32_SYSTEM
-# ifdef HAVE_W32CE_SYSTEM
-#  define FD_FOR_STDIN  (es_fileno (es_stdin))
-#  define FD_FOR_STDOUT (es_fileno (es_stdout))
-# else
-#  define FD_FOR_STDIN  (GetStdHandle (STD_INPUT_HANDLE))
-#  define FD_FOR_STDOUT (GetStdHandle (STD_OUTPUT_HANDLE))
-# endif
+# define FD_FOR_STDIN  (GetStdHandle (STD_INPUT_HANDLE))
+# define FD_FOR_STDOUT (GetStdHandle (STD_OUTPUT_HANDLE))
 #else /*!HAVE_W32_SYSTEM*/
 # define FD_FOR_STDIN  (0)
 # define FD_FOR_STDOUT (1)
@@ -1287,14 +1282,8 @@ iobuf_cancel (iobuf_t a)
     {
       /* Argg, MSDOS does not allow removing open files.  So
        * we have to do it here */
-#ifdef HAVE_W32CE_SYSTEM
-      wchar_t *wtmp = utf8_to_wchar (remove_name);
-      if (wtmp)
-        DeleteFile (wtmp);
-      xfree (wtmp);
-#else
-      remove (remove_name);
-#endif
+      gnupg_remove (remove_name);
+
       xfree (remove_name);
     }
 #endif
@@ -2177,7 +2166,8 @@ iobuf_read (iobuf_t a, void *buffer, unsigned int buflen)
   a->e_d.len = 0;
 
   /* Hint for how full to fill iobuf internal drain buffer. */
-  a->e_d.preferred = (buf && buflen >= IOBUF_ZEROCOPY_THRESHOLD_SIZE);
+  a->e_d.preferred = (a->use != IOBUF_INPUT_TEMP)
+    && (buf && buflen >= IOBUF_ZEROCOPY_THRESHOLD_SIZE);
 
   n = 0;
   do
@@ -2200,7 +2190,7 @@ iobuf_read (iobuf_t a, void *buffer, unsigned int buflen)
 	   underflow to read more data into the filter's internal
 	   buffer.  */
 	{
-	  if (buf && n < buflen)
+	  if (a->use != IOBUF_INPUT_TEMP && buf && n < buflen)
 	    {
 	      /* Setup external drain buffer for faster moving of data
 	       * (avoid memcpy). */
@@ -2328,11 +2318,13 @@ iobuf_write (iobuf_t a, const void *buffer, unsigned int buflen)
   a->e_d.len = 0;
 
   /* Hint for how full to fill iobuf internal drain buffer. */
-  a->e_d.preferred = (buflen >= IOBUF_ZEROCOPY_THRESHOLD_SIZE);
+  a->e_d.preferred = (a->use != IOBUF_OUTPUT_TEMP)
+    && (buflen >= IOBUF_ZEROCOPY_THRESHOLD_SIZE);
 
   do
     {
-      if (a->d.len == 0 && buflen >= IOBUF_ZEROCOPY_THRESHOLD_SIZE)
+      if ((a->use != IOBUF_OUTPUT_TEMP)
+	  && a->d.len == 0 && buflen >= IOBUF_ZEROCOPY_THRESHOLD_SIZE)
 	{
 	  /* Setup external drain buffer for faster moving of data
 	    * (avoid memcpy). */
@@ -2890,12 +2882,7 @@ iobuf_read_line (iobuf_t a, byte ** addr_of_buffer,
 static int
 translate_file_handle (int fd, int for_write)
 {
-#if defined(HAVE_W32CE_SYSTEM)
-  /* This is called only with one of the special filenames.  Under
-     W32CE the FD here is not a file descriptor but a rendezvous id,
-     thus we need to finish the pipe first.  */
-  fd = _assuan_w32ce_finish_pipe (fd, for_write);
-#elif defined(HAVE_W32_SYSTEM)
+#if defined(HAVE_W32_SYSTEM)
   {
     int x;
 
diff --git a/common/miscellaneous.c b/common/miscellaneous.c
index 5ede001..df6b687 100644
--- a/common/miscellaneous.c
+++ b/common/miscellaneous.c
@@ -712,3 +712,83 @@ parse_debug_flag (const char *string, unsigned int *debugvar,
   *debugvar |= result;
   return 0;
 }
+
+
+
+/* Parse an --comaptibility_flags style argument consisting of comma
+ * separated strings.
+ *
+ * Returns: 0 on success or -1 and ERRNO set on error.  On success the
+ *          supplied variable is updated by the parsed flags.
+ *
+ * If STRING is NULL the enabled flags are printed.
+ */
+int
+parse_compatibility_flags (const char *string, unsigned int *flagvar,
+                           const struct compatibility_flags_s *flags)
+
+{
+  unsigned long result = 0;
+  int i, j;
+
+  if (!string)
+    {
+      if (flagvar)
+        {
+          log_info ("enabled compatibility flags:");
+          for (i=0; flags[i].name; i++)
+            if ((*flagvar & flags[i].flag))
+              log_printf (" %s", flags[i].name);
+          log_printf ("\n");
+        }
+      return 0;
+    }
+
+  while (spacep (string))
+    string++;
+
+  if (!strcmp (string, "?") || !strcmp (string, "help"))
+    {
+      log_info ("available compatibility flags:\n");
+      for (i=0; flags[i].name; i++)
+        log_info (" %s\n", flags[i].name);
+      if (flags[i].flag != 77)
+        exit (0);
+    }
+  else
+    {
+      char **words;
+      words = strtokenize (string, ",");
+      if (!words)
+        return -1;
+      for (i=0; words[i]; i++)
+        {
+          if (*words[i])
+            {
+              for (j=0; flags[j].name; j++)
+                if (!strcmp (words[i], flags[j].name))
+                  {
+                    result |= flags[j].flag;
+                    break;
+                  }
+              if (!flags[j].name)
+                {
+                  if (!strcmp (words[i], "none"))
+                    {
+                      *flagvar = 0;
+                      result = 0;
+                    }
+                  else if (!strcmp (words[i], "all"))
+                    result = ~0;
+                  else
+                    log_info ("unknown compatibility flag '%s' ignored\n",
+                              words[i]);
+                }
+            }
+        }
+      xfree (words);
+    }
+
+  *flagvar |= result;
+  return 0;
+}
diff --git a/common/mischelp.c b/common/mischelp.c
index 81dd501..ee85002 100644
--- a/common/mischelp.c
+++ b/common/mischelp.c
@@ -80,35 +80,30 @@ same_file_p (const char *name1, const char *name2)
 #ifdef HAVE_W32_SYSTEM
       HANDLE file1, file2;
       BY_HANDLE_FILE_INFORMATION info1, info2;
+      wchar_t *wname;
+
+      wname = gpgrt_fname_to_wchar (name1);
+      if (wname)
+        {
+          file1 = CreateFileW (wname, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
+          xfree (wname);
+        }
+      else
+        file1 = INVALID_HANDLE_VALUE;
 
-#ifdef HAVE_W32CE_SYSTEM
-      {
-        wchar_t *wname = utf8_to_wchar (name1);
-        if (wname)
-          file1 = CreateFile (wname, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
-        else
-          file1 = INVALID_HANDLE_VALUE;
-        xfree (wname);
-      }
-#else
-      file1 = CreateFile (name1, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
-#endif
       if (file1 == INVALID_HANDLE_VALUE)
         yes = 0; /* If we can't open the file, it is not the same.  */
       else
         {
-#ifdef HAVE_W32CE_SYSTEM
-          {
-            wchar_t *wname = utf8_to_wchar (name2);
-            if (wname)
-              file2 = CreateFile (wname, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
-            else
-              file2 = INVALID_HANDLE_VALUE;
-            xfree (wname);
-          }
-#else
-          file2 = CreateFile (name2, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
-#endif
+          wname = gpgrt_fname_to_wchar (name2);
+          if (wname)
+            {
+              file2 = CreateFileW (wname, 0, 0, NULL, OPEN_EXISTING, 0, NULL);
+              xfree (wname);
+            }
+          else
+            file2 = INVALID_HANDLE_VALUE;
+
           if (file2 == INVALID_HANDLE_VALUE)
             yes = 0; /* If we can't open the file, it is not the same.  */
           else
diff --git a/common/openpgp-oid.c b/common/openpgp-oid.c
index 0189407..f0460b0 100644
--- a/common/openpgp-oid.c
+++ b/common/openpgp-oid.c
@@ -658,7 +658,7 @@ get_keyalgo_string (enum gcry_pk_algos algo,
       for (i=0; i < keyalgo_strings_used; i++)
         {
           if (keyalgo_strings[i].algo == algo
-              && keyalgo_strings[i].curve
+              && keyalgo_strings[i].curve && curve
               && !strcmp (keyalgo_strings[i].curve, curve))
             return keyalgo_strings[i].name;
         }
@@ -672,7 +672,7 @@ get_keyalgo_string (enum gcry_pk_algos algo,
       else
         name = xasprintf ("E_error");
       nbits = 0;
-      curvebuf = xstrdup (curve);
+      curvebuf = curve? xstrdup (curve) : NULL;
     }
   else
     {
diff --git a/common/stringhelp.c b/common/stringhelp.c
index 3e56d66..6959299 100644
--- a/common/stringhelp.c
+++ b/common/stringhelp.c
@@ -783,11 +783,6 @@ w32_strerror (int ec)
 
   if (ec == -1)
     ec = (int)GetLastError ();
-#ifdef HAVE_W32CE_SYSTEM
-  /* There is only a wchar_t FormatMessage.  It does not make much
-     sense to play the conversion game; we print only the code.  */
-  snprintf (strerr, sizeof strerr, "ec=%d", (int)GetLastError ());
-#else
   FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM, NULL, ec,
                  MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
                  strerr, DIM (strerr)-1, NULL);
@@ -797,7 +792,6 @@ w32_strerror (int ec)
     if (n > 2 && strerr[n-2] == '\r' && strerr[n-1] == '\n' )
       strerr[n-2] = 0;
   }
-#endif
   return strerr;
 }
 #endif /*HAVE_W32_SYSTEM*/
diff --git a/common/sysutils.c b/common/sysutils.c
index 1342d10..21b6eef 100644
--- a/common/sysutils.c
+++ b/common/sysutils.c
@@ -535,10 +535,7 @@ gnupg_usleep (unsigned int usecs)
 int
 translate_sys2libc_fd (gnupg_fd_t fd, int for_write)
 {
-#if defined(HAVE_W32CE_SYSTEM)
-  (void)for_write;
-  return (int) fd;
-#elif defined(HAVE_W32_SYSTEM)
+#if defined(HAVE_W32_SYSTEM)
   int x;
 
   if (fd == GNUPG_INVALID_FD)
@@ -563,10 +560,7 @@ translate_sys2libc_fd (gnupg_fd_t fd, int for_write)
 int
 translate_sys2libc_fd_int (int fd, int for_write)
 {
-#if HAVE_W32CE_SYSTEM
-  fd = (int) _assuan_w32ce_finish_pipe (fd, for_write);
-  return translate_sys2libc_fd ((void*)fd, for_write);
-#elif HAVE_W32_SYSTEM
+#ifdef HAVE_W32_SYSTEM
   if (fd <= 2)
     return fd;	/* Do not do this for error, stdin, stdout, stderr. */
 
@@ -611,15 +605,8 @@ gnupg_tmpfile (void)
 {
 #ifdef HAVE_W32_SYSTEM
   int attempts, n;
-#ifdef HAVE_W32CE_SYSTEM
-  wchar_t buffer[MAX_PATH+7+12+1];
-# define mystrlen(a) wcslen (a)
-  wchar_t *name, *p;
-#else
   char buffer[MAX_PATH+7+12+1];
-# define mystrlen(a) strlen (a)
   char *name, *p;
-#endif
   HANDLE file;
   int pid = GetCurrentProcessId ();
   unsigned int value;
@@ -631,18 +618,13 @@ gnupg_tmpfile (void)
   sec_attr.bInheritHandle = TRUE;
 
   n = GetTempPath (MAX_PATH+1, buffer);
-  if (!n || n > MAX_PATH || mystrlen (buffer) > MAX_PATH)
+  if (!n || n > MAX_PATH || strlen (buffer) > MAX_PATH)
     {
       gpg_err_set_errno (ENOENT);
       return NULL;
     }
-  p = buffer + mystrlen (buffer);
-#ifdef HAVE_W32CE_SYSTEM
-  wcscpy (p, L"_gnupg");
-  p += 7;
-#else
+  p = buffer + strlen (buffer);
   p = stpcpy (p, "_gnupg");
-#endif
   /* We try to create the directory but don't care about an error as
      it may already exist and the CreateFile would throw an error
      anyway.  */
@@ -658,11 +640,7 @@ gnupg_tmpfile (void)
           *p++ = tohex (((value >> 28) & 0x0f));
           value <<= 4;
         }
-#ifdef HAVE_W32CE_SYSTEM
-      wcscpy (p, L".tmp");
-#else
       strcpy (p, ".tmp");
-#endif
       file = CreateFile (buffer,
                          GENERIC_READ | GENERIC_WRITE,
                          0,
@@ -673,10 +651,6 @@ gnupg_tmpfile (void)
       if (file != INVALID_HANDLE_VALUE)
         {
           FILE *fp;
-#ifdef HAVE_W32CE_SYSTEM
-          int fd = (int)file;
-          fp = _wfdopen (fd, L"w+b");
-#else
           int fd = _open_osfhandle ((intptr_t)file, 0);
           if (fd == -1)
             {
@@ -684,7 +658,6 @@ gnupg_tmpfile (void)
               return NULL;
             }
           fp = fdopen (fd, "w+b");
-#endif
           if (!fp)
             {
               int save = errno;
@@ -698,9 +671,11 @@ gnupg_tmpfile (void)
     }
   gpg_err_set_errno (ENOENT);
   return NULL;
-#undef mystrlen
+
 #else /*!HAVE_W32_SYSTEM*/
+
   return tmpfile ();
+
 #endif /*!HAVE_W32_SYSTEM*/
 }
 
@@ -799,7 +774,7 @@ gnupg_allow_set_foregound_window (pid_t pid)
   if (!pid)
     log_info ("%s called with invalid pid %lu\n",
               "gnupg_allow_set_foregound_window", (unsigned long)pid);
-#if defined(HAVE_W32_SYSTEM) && !defined(HAVE_W32CE_SYSTEM)
+#if defined(HAVE_W32_SYSTEM)
   else if (inhibit_set_foregound_window)
     ;
   else if (!AllowSetForegroundWindow ((pid_t)pid == (pid_t)(-1)?ASFW_ANY:pid))
@@ -1148,13 +1123,7 @@ gnupg_mkdtemp (char *tmpl)
 int
 gnupg_setenv (const char *name, const char *value, int overwrite)
 {
-#ifdef HAVE_W32CE_SYSTEM
-  (void)name;
-  (void)value;
-  (void)overwrite;
-  return 0;
-#else /*!W32CE*/
-# ifdef HAVE_W32_SYSTEM
+#ifdef HAVE_W32_SYSTEM
   /*  Windows maintains (at least) two sets of environment variables.
       One set can be accessed by GetEnvironmentVariable and
       SetEnvironmentVariable.  This set is inherited by the children.
@@ -1172,11 +1141,11 @@ gnupg_setenv (const char *name, const char *value, int overwrite)
         return -1;
       }
   }
-# endif /*W32*/
+#endif /*W32*/
 
-# ifdef HAVE_SETENV
+#ifdef HAVE_SETENV
   return setenv (name, value, overwrite);
-# else /*!HAVE_SETENV*/
+#else /*!HAVE_SETENV*/
   if (! getenv (name) || overwrite)
     {
       char *buf;
@@ -1196,19 +1165,14 @@ gnupg_setenv (const char *name, const char *value, int overwrite)
       return putenv (buf);
     }
   return 0;
-# endif /*!HAVE_SETENV*/
-#endif /*!W32CE*/
+#endif /*!HAVE_SETENV*/
 }
 
 
 int
 gnupg_unsetenv (const char *name)
 {
-#ifdef HAVE_W32CE_SYSTEM
-  (void)name;
-  return 0;
-#else /*!W32CE*/
-# ifdef HAVE_W32_SYSTEM
+#ifdef HAVE_W32_SYSTEM
   /*  Windows maintains (at least) two sets of environment variables.
       One set can be accessed by GetEnvironmentVariable and
       SetEnvironmentVariable.  This set is inherited by the children.
@@ -1220,11 +1184,11 @@ gnupg_unsetenv (const char *name)
       gpg_err_set_errno (EINVAL); /* (Might also be ENOMEM.) */
       return -1;
     }
-# endif /*W32*/
+#endif /*W32*/
 
-# ifdef HAVE_UNSETENV
+#ifdef HAVE_UNSETENV
   return unsetenv (name);
-# else /*!HAVE_UNSETENV*/
+#else /*!HAVE_UNSETENV*/
   {
     char *buf;
 
@@ -1241,8 +1205,7 @@ gnupg_unsetenv (const char *name)
 #  endif
     return putenv (buf);
   }
-# endif /*!HAVE_UNSETENV*/
-#endif /*!W32CE*/
+#endif /*!HAVE_UNSETENV*/
 }
 
 
@@ -1571,43 +1534,6 @@ gnupg_chuid (const char *user, int silent)
 
 
 
-#ifdef HAVE_W32CE_SYSTEM
-/* There is a isatty function declaration in cegcc but it does not
-   make sense, thus we redefine it.  */
-int
-_gnupg_isatty (int fd)
-{
-  (void)fd;
-  return 0;
-}
-#endif
-
-
-#ifdef HAVE_W32CE_SYSTEM
-/* Replacement for getenv which takes care of the our use of getenv.
-   The code is not thread safe but we expect it to work in all cases
-   because it is called for the first time early enough.  */
-char *
-_gnupg_getenv (const char *name)
-{
-  static int initialized;
-  static char *assuan_debug;
-
-  if (!initialized)
-    {
-      assuan_debug = read_w32_registry_string (NULL,
-                                               "\\Software\\GNU\\libassuan",
-                                               "debug");
-      initialized = 1;
-    }
-
-  if (!strcmp (name, "ASSUAN_DEBUG"))
-    return assuan_debug;
-  else
-    return NULL;
-}
-
-#endif /*HAVE_W32CE_SYSTEM*/
 
 
 #ifdef HAVE_W32_SYSTEM
diff --git a/common/t-stringhelp.c b/common/t-stringhelp.c
index 4086f8c..6723d65 100644
--- a/common/t-stringhelp.c
+++ b/common/t-stringhelp.c
@@ -83,10 +83,6 @@ mygetcwd (void)
   for (;;)
     {
       buffer = xmalloc (size+1);
-#ifdef HAVE_W32CE_SYSTEM
-      strcpy (buffer, "/");  /* Always "/".  */
-      return buffer;
-#else
       if (getcwd (buffer, size) == buffer)
         {
 #ifdef HAVE_W32_SYSTEM
@@ -105,7 +101,6 @@ mygetcwd (void)
           exit (2);
         }
       size *= 2;
-#endif
     }
 }
 
diff --git a/common/t-sysutils.c b/common/t-sysutils.c
index 79f8385..9908c16 100644
--- a/common/t-sysutils.c
+++ b/common/t-sysutils.c
@@ -24,10 +24,6 @@
 #include "util.h"
 #include "sysutils.h"
 
-#ifdef HAVE_W32CE_SYSTEM
-# define rewind(f) do { fseek (f, 0, SEEK_SET); clearerr (f); } while (0)
-#endif
-
 #define pass()  do { ; } while(0)
 #define fail(a)  do { fprintf (stderr, "%s:%d: test %d failed\n",\
                                __FILE__,__LINE__, (a));          \
diff --git a/common/utf8conv.c b/common/utf8conv.c
index 1f01841..8b66e7f 100644
--- a/common/utf8conv.c
+++ b/common/utf8conv.c
@@ -170,10 +170,8 @@ set_native_charset (const char *newset)
          different one for console input.  Not sure how to cope with
          that.  If the console Code page is not known we fall back to
          the system code page.  */
-#ifndef HAVE_W32CE_SYSTEM
       cpno = GetConsoleOutputCP ();
       if (!cpno)
-#endif
         cpno = GetACP ();
       sprintf (codepage, "CP%u", cpno );
       /* Resolve alias.  We use a long string string and not the usual
@@ -806,10 +804,8 @@ get_w32_codepage (void)
 
   if (!cp)
     {
-#ifndef HAVE_W32CE_SYSTEM
       cp = GetConsoleOutputCP ();
       if (!cp)
-#endif
         cp = GetACP ();
     }
   return cp;
diff --git a/common/util.h b/common/util.h
index 43cb2fd..62e5af5 100644
--- a/common/util.h
+++ b/common/util.h
@@ -372,6 +372,15 @@ struct debug_flags_s
 int parse_debug_flag (const char *string, unsigned int *debugvar,
                       const struct debug_flags_s *flags);
 
+struct compatibility_flags_s
+{
+  unsigned int flag;
+  const char *name;
+  const char *desc;
+};
+int parse_compatibility_flags (const char *string, unsigned int *flagvar,
+                               const struct compatibility_flags_s *flags);
+
 
 /*-- Simple replacement functions. */
 
@@ -390,18 +399,7 @@ _gnupg_ttyname (int fd)
 # define gnupg_ttyname(n) ttyname ((n))
 #endif /*HAVE_TTYNAME */
 
-#ifdef HAVE_W32CE_SYSTEM
-#define getpid() GetCurrentProcessId ()
-char *_gnupg_getenv (const char *name); /* See sysutils.c */
-#define getenv(a)  _gnupg_getenv ((a))
-char *_gnupg_setenv (const char *name); /* See sysutils.c */
-#define setenv(a,b,c)  _gnupg_setenv ((a),(b),(c))
-int _gnupg_isatty (int fd);
-#define gnupg_isatty(a)  _gnupg_isatty ((a))
-#else
 #define gnupg_isatty(a)  isatty ((a))
-#endif
-
 
 
 /*-- Macros to replace ctype ones to avoid locale problems. --*/
diff --git a/common/w32help.h b/common/w32help.h
index a79081f..33000ac 100644
--- a/common/w32help.h
+++ b/common/w32help.h
@@ -46,21 +46,6 @@ char *read_w32_registry_string (const char *root,
 				const char *dir, const char *name );
 char *read_w32_reg_string (const char *key);
 
-/* Other stuff.  */
-#ifdef HAVE_W32CE_SYSTEM
-/* Setmode is missing in cegcc but available since CE 5.0.  */
-int _setmode (int handle, int mode);
-# define setmode(a,b)   _setmode ((a),(b))
-
-static inline int
-umask (int a)
-{
-  (void)a;
-  return 0;
-}
-
-
-#endif /*HAVE_W32CE_SYSTEM*/
 
 #endif /*HAVE_W32_SYSTEM*/
 #endif /*GNUPG_COMMON_MISCHELP_H*/
diff --git a/configure b/configure
index 9f6d18a..2ca934a 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.5.
+# Generated by GNU Autoconf 2.69 for gnupg 2.3.7.
 #
 # 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.5'
-PACKAGE_STRING='gnupg 2.3.5'
+PACKAGE_VERSION='2.3.7'
+PACKAGE_STRING='gnupg 2.3.7'
 PACKAGE_BUGREPORT='https://bugs.gnupg.org'
 PACKAGE_URL=''
 
@@ -1557,7 +1557,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.5 to adapt to many kinds of systems.
+\`configure' configures gnupg 2.3.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1628,7 +1628,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gnupg 2.3.5:";;
+     short | recursive ) echo "Configuration of gnupg 2.3.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1850,7 +1850,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gnupg configure 2.3.5
+gnupg configure 2.3.7
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2559,7 +2559,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.5, which was
+It was created by gnupg $as_me 2.3.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3458,7 +3458,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gnupg'
- VERSION='2.3.5'
+ VERSION='2.3.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16535,7 +16535,7 @@ fi
 #
 # Provide information about the build.
 #
-BUILD_REVISION="a4b25bcfe"
+BUILD_REVISION="bc5328f51"
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16544,7 +16544,7 @@ _ACEOF
 
 
 BUILD_VERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./'`
-BUILD_VERSION="${BUILD_VERSION}42162"
+BUILD_VERSION="${BUILD_VERSION}48211"
 BUILD_FILEVERSION=`echo "${BUILD_VERSION}" | tr . ,`
 
 
@@ -17424,7 +17424,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.5, which was
+This file was extended by gnupg $as_me 2.3.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17490,7 +17490,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.5
+gnupg config.status 2.3.7
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -18511,7 +18511,7 @@ fi
 echo "
         GnuPG v${VERSION} has been configured as follows:
 
-        Revision:  a4b25bcfe  (42162)
+        Revision:  bc5328f51  (48211)
         Platform:  $PRINTABLE_OS_NAME ($host)
 
         OpenPGP:   $build_gpg
diff --git a/configure.ac b/configure.ac
index f615867..5cd1506 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ min_automake_version="1.16.3"
 m4_define([mym4_package],[gnupg])
 m4_define([mym4_major], [2])
 m4_define([mym4_minor], [3])
-m4_define([mym4_micro], [5])
+m4_define([mym4_micro], [7])
 
 # 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
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index dec5c57..dbe9719 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -173,7 +173,7 @@ static gpgrt_opt_t opts[] = {
   ARGPARSE_c (aServer,   "server",  N_("run in server mode (foreground)") ),
   ARGPARSE_c (aDaemon,   "daemon",  N_("run in daemon mode (background)") ),
 #ifndef HAVE_W32_SYSTEM
-  ARGPARSE_c (aSupervised,  "supervised", N_("run in supervised mode")),
+  ARGPARSE_c (aSupervised,  "supervised", "@"),
 #endif
   ARGPARSE_c (aListCRLs, "list-crls", N_("list the contents of the CRL cache")),
   ARGPARSE_c (aLoadCRL,  "load-crl", N_("|FILE|load CRL from FILE into cache")),
@@ -1275,12 +1275,16 @@ main (int argc, char **argv)
 #ifndef HAVE_W32_SYSTEM
   else if (cmd == aSupervised)
     {
+      struct stat statbuf;
+
+      if (!opt.quiet)
+        log_info(_("WARNING: \"%s\" is a deprecated option\n"), "--supervised");
+
       /* In supervised mode, we expect file descriptor 3 to be an
          already opened, listening socket.
 
          We will also not detach from the controlling process or close
          stderr; the supervisor should handle all of that.  */
-      struct stat statbuf;
       if (fstat (3, &statbuf) == -1 && errno == EBADF)
         {
           log_error ("file descriptor 3 must be validin --supervised mode\n");
diff --git a/dirmngr/http.c b/dirmngr/http.c
index 1050d19..20f71f6 100644
--- a/dirmngr/http.c
+++ b/dirmngr/http.c
@@ -64,6 +64,12 @@
 #  include <winsock2.h>
 # endif
 # include <windows.h>
+# ifndef EHOSTUNREACH
+#  define EHOSTUNREACH WSAEHOSTUNREACH
+# endif
+# ifndef EAFNOSUPPORT
+#  define EAFNOSUPPORT WSAEAFNOSUPPORT
+# endif
 #else /*!HAVE_W32_SYSTEM*/
 # include <sys/types.h>
 # include <sys/socket.h>
@@ -440,20 +446,48 @@ static ssize_t
 my_gnutls_read (gnutls_transport_ptr_t ptr, void *buffer, size_t size)
 {
   my_socket_t sock = ptr;
-#if USE_NPTH
+#ifdef HAVE_W32_SYSTEM
+  /* Under Windows we need to use recv for a socket.  */
+  int nread;
+# if USE_NPTH
+  npth_unprotect ();
+# endif
+  nread = recv (FD2INT (sock->fd), buffer, size, 0);
+# if USE_NPTH
+  npth_protect ();
+# endif
+  return nread;
+
+#else  /* !HAVE_W32_SYSTEM */
+# if USE_NPTH
   return npth_read (sock->fd, buffer, size);
-#else
+# else
   return read (sock->fd, buffer, size);
+# endif
 #endif
 }
 static ssize_t
 my_gnutls_write (gnutls_transport_ptr_t ptr, const void *buffer, size_t size)
 {
   my_socket_t sock = ptr;
-#if USE_NPTH
+#ifdef HAVE_W32_SYSTEM
+  int nwritten;
+# if USE_NPTH
+  npth_unprotect ();
+# endif
+  nwritten = send (FD2INT (sock->fd), buffer, size, 0);
+# if USE_NPTH
+  npth_protect ();
+# endif
+  return nwritten;
+
+#else /*!HAVE_W32_SYSTEM*/
+
+# if USE_NPTH
   return npth_write (sock->fd, buffer, size);
-#else
+# else
   return write (sock->fd, buffer, size);
+# endif
 #endif
 }
 #endif /*HTTP_USE_GNUTLS*/
diff --git a/dirmngr/validate.c b/dirmngr/validate.c
index c189ea9..55cf9b1 100644
--- a/dirmngr/validate.c
+++ b/dirmngr/validate.c
@@ -955,7 +955,7 @@ check_cert_sig (ksba_cert_t issuer_cert, ksba_cert_t cert)
   int digestlen;
   unsigned char *digest;
   int use_pss = 0;
-  unsigned int saltlen;  /* (use is controlled by use_pss) */
+  unsigned int saltlen = 0;  /* (use is actually controlled by use_pss) */
 
   /* Hash the target certificate using the algorithm from that certificate.  */
   algoid = ksba_cert_get_digest_algo (cert);
diff --git a/doc/defsincdate b/doc/defsincdate
index 885e925..67e4e0d 100644
--- a/doc/defsincdate
+++ b/doc/defsincdate
@@ -1 +1 @@
-1647940795
+1656346000
diff --git a/doc/dirmngr.texi b/doc/dirmngr.texi
index bc6f0ba..6c1c59b 100644
--- a/doc/dirmngr.texi
+++ b/doc/dirmngr.texi
@@ -90,8 +90,7 @@ general best to use @code{gpgconf --launch dirmngr}.
 @opindex supervised
 Run in the foreground, sending logs to stderr, and listening on file
 descriptor 3, which must already be bound to a listening socket.  This
-is useful when running under systemd or other similar process
-supervision schemes.  This option is not supported on Windows.
+option is deprecated and not supported on Windows.
 
 @item --list-crls
 @opindex list-crls
diff --git a/doc/gnupg-card-architecture.pdf b/doc/gnupg-card-architecture.pdf
index e6371b4..1968297 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 fcd4136..eb363a3 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 89e99ba..15e84c0 100644
--- a/doc/gnupg-module-overview.png
+++ b/doc/gnupg-module-overview.png
diff --git a/doc/gnupg.info b/doc/gnupg.info
index 4d9fcaf..8df1bc7 100644
--- a/doc/gnupg.info
+++ b/doc/gnupg.info
@@ -1,6 +1,6 @@
 This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
 
-This is the 'The GNU Privacy Guard Manual' (version 2.3.5-beta20, March
+This is the 'The GNU Privacy Guard Manual' (version 2.3.7-beta30, June
 2022).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
@@ -23,204 +23,205 @@ END-INFO-DIR-ENTRY
 
 
 Indirect:
-gnupg.info-1: 988
-gnupg.info-2: 305147
-gnupg.info-3: 623928
+gnupg.info-1: 987
+gnupg.info-2: 305983
+gnupg.info-3: 625337
 
 Tag Table:
 (Indirect)
-Node: Top988
-Node: Installation2975
-Node: Invoking GPG-AGENT5324
-Node: Agent Commands7090
-Node: Agent Options8894
-Ref: option --options9174
-Ref: option --homedir9500
-Ref: option --log-file14572
-Ref: option --no-allow-mark-trusted14945
-Ref: option --allow-preset-passphrase15149
-Ref: option --no-allow-loopback-pinentry15302
-Ref: option --extra-socket23655
-Ref: option --enable-ssh-support25029
-Ref: option --ssh-fingerprint-digest27366
-Node: Agent Configuration29023
-Node: Agent Signals34730
-Node: Agent Examples36190
-Node: Agent Protocol36757
-Node: Agent PKDECRYPT38911
-Node: Agent PKSIGN40823
-Node: Agent GENKEY43127
-Node: Agent IMPORT45024
-Node: Agent EXPORT45468
-Node: Agent ISTRUSTED45683
-Node: Agent GET_PASSPHRASE48058
-Node: Agent CLEAR_PASSPHRASE50499
-Node: Agent PRESET_PASSPHRASE50890
-Node: Agent GET_CONFIRMATION51728
-Node: Agent HAVEKEY52400
-Node: Agent LEARN53032
-Node: Agent PASSWD53330
-Node: Agent UPDATESTARTUPTTY53796
-Node: Agent GETEVENTCOUNTER54274
-Node: Agent GETINFO55082
-Node: Agent OPTION55786
-Node: Invoking DIRMNGR58844
-Node: Dirmngr Commands59742
-Node: Dirmngr Options62195
-Ref: Dirmngr Options-Footnote-180654
-Node: Dirmngr Configuration80789
-Node: Dirmngr Signals85667
-Node: Dirmngr Examples86695
-Node: Dirmngr Protocol87377
-Node: Dirmngr LOOKUP88027
-Node: Dirmngr ISVALID89398
-Node: Dirmngr CHECKCRL91971
-Node: Dirmngr CHECKOCSP93028
-Node: Dirmngr CACHECERT94334
-Node: Dirmngr VALIDATE95173
-Node: Invoking GPG95741
-Node: GPG Commands96971
-Node: General GPG Commands97865
-Node: Operational GPG Commands98554
-Ref: option --export-ownertrust115855
-Node: OpenPGP Key Management118450
-Node: GPG Options141673
-Node: GPG Configuration Options143006
-Ref: gpg-option --options156457
-Ref: trust-model-tofu161025
-Node: GPG Key related Options180976
-Node: GPG Input and Output187297
-Node: OpenPGP Options201305
-Node: Compliance Options207108
-Node: GPG Esoteric Options210789
-Ref: GPG Esoteric Options-Footnote-1240886
-Node: Deprecated Options241040
-Node: GPG Configuration242543
-Node: GPG Examples248419
-Node: Unattended Usage of GPG257230
-Node: Programmatic use of GnuPG257861
-Node: Ephemeral home directories258412
-Node: The quick key manipulation interface259719
-Node: Unattended GPG key generation260306
-Node: Invoking GPGSM269625
-Node: GPGSM Commands270494
-Node: General GPGSM Commands270932
-Node: Operational GPGSM Commands271620
-Node: Certificate Management273654
-Node: GPGSM Options279100
-Node: Configuration Options279674
-Ref: gpgsm-option --options279943
-Node: Certificate Options283132
-Ref: gpgsm-option --validation-model286736
-Node: Input and Output287716
-Ref: option --p12-charset288299
-Ref: gpgsm-option --with-key-data289543
-Ref: gpgsm-option --with-validation289817
-Node: CMS Options290695
-Node: Esoteric Options291715
-Node: GPGSM Configuration298643
-Node: GPGSM Examples305147
-Node: Unattended Usage305344
-Node: Automated signature checking305935
-Node: CSR and certificate creation307758
-Node: GPGSM Protocol313417
-Node: GPGSM ENCRYPT314673
-Node: GPGSM DECRYPT317348
-Node: GPGSM SIGN318184
-Node: GPGSM VERIFY319640
-Node: GPGSM GENKEY320156
-Node: GPGSM LISTKEYS321171
-Ref: gpgsm-cmd listkeys321330
-Node: GPGSM EXPORT322083
-Node: GPGSM IMPORT323047
-Node: GPGSM DELETE323788
-Node: GPGSM GETAUDITLOG324295
-Ref: gpgsm-cmd getauditlog324464
-Node: GPGSM GETINFO324808
-Node: GPGSM OPTION325657
-Node: Invoking SCDAEMON329010
-Node: Scdaemon Commands329684
-Node: Scdaemon Options330812
-Node: Card applications339746
-Node: OpenPGP Card340411
-Node: NKS Card340884
-Node: DINSIG Card341210
-Node: PKCS#15 Card341586
-Node: Geldkarte Card341856
-Node: SmartCard-HSM342247
-Node: Undefined Card342843
-Node: Scdaemon Configuration343256
-Node: Scdaemon Examples344294
-Node: Scdaemon Protocol344477
-Node: Scdaemon SERIALNO345996
-Node: Scdaemon LEARN346842
-Node: Scdaemon READCERT347689
-Node: Scdaemon READKEY348091
-Node: Scdaemon PKSIGN348377
-Node: Scdaemon PKDECRYPT349103
-Node: Scdaemon GETATTR349853
-Node: Scdaemon SETATTR350055
-Node: Scdaemon WRITEKEY350260
-Node: Scdaemon GENKEY350962
-Node: Scdaemon RANDOM351165
-Node: Scdaemon PASSWD351388
-Node: Scdaemon CHECKPIN351779
-Node: Scdaemon RESTART352782
-Node: Scdaemon APDU353315
-Node: Specify a User ID354288
-Ref: how-to-specify-a-user-id354446
-Node: Trust Values359304
-Ref: trust-values359436
-Node: Smart Card Tool360041
-Node: gpg-card360387
-Node: Helper Tools389687
-Node: watchgnupg390544
-Ref: option watchgnupg --tcp391901
-Node: gpgv393565
-Node: addgnupghome398772
-Node: gpgconf399470
-Ref: gpgconf-Footnote-1401659
-Node: Invoking gpgconf401957
-Node: Format conventions409106
-Node: Listing components414439
-Node: Checking programs416524
-Node: Listing options419264
-Node: Changing options426762
-Node: Listing global options428466
-Node: Querying versions430448
-Node: Files used by gpgconf433148
-Node: applygnupgdefaults433756
-Node: gpg-preset-passphrase434628
-Node: Invoking gpg-preset-passphrase435665
-Node: gpg-connect-agent437069
-Node: Invoking gpg-connect-agent437785
-Node: Controlling gpg-connect-agent442312
-Node: dirmngr-client448839
-Node: gpgparsemail452192
-Node: gpgtar452507
-Node: gpg-check-pattern457310
-Node: Web Key Service459614
-Node: gpg-wks-client459927
-Node: gpg-wks-server464795
-Node: Howtos470217
-Node: Howto Create a Server Cert470489
-Node: System Notes478902
-Node: W32 Notes480113
-Node: Debugging480535
-Node: Debugging Tools481363
-Node: kbxutil481643
-Node: Debugging Hints483174
-Node: Common Problems484305
-Node: Architecture Details489542
-Node: Component interaction489852
-Ref: fig:moduleoverview490038
-Node: GnuPG-1 and GnuPG-2490145
-Ref: fig:cardarchitecture490435
-Node: Copying490550
-Node: Contributors528074
-Node: Glossary534329
-Node: Option Index536848
-Node: Environment Index623928
-Node: Index629594
+Node: Top987
+Node: Installation2973
+Node: Invoking GPG-AGENT5322
+Node: Agent Commands7088
+Node: Agent Options8805
+Ref: option --options9085
+Ref: option --homedir9411
+Ref: option --log-file14483
+Ref: option --no-allow-mark-trusted14856
+Ref: option --no-user-trustlist15060
+Ref: option --allow-preset-passphrase15526
+Ref: option --no-allow-loopback-pinentry15679
+Ref: option --extra-socket24032
+Ref: option --enable-ssh-support25406
+Ref: option --ssh-fingerprint-digest27743
+Node: Agent Configuration29400
+Node: Agent Signals35199
+Node: Agent Examples36659
+Node: Agent Protocol37226
+Node: Agent PKDECRYPT39380
+Node: Agent PKSIGN41292
+Node: Agent GENKEY43596
+Node: Agent IMPORT45493
+Node: Agent EXPORT45937
+Node: Agent ISTRUSTED46152
+Node: Agent GET_PASSPHRASE48527
+Node: Agent CLEAR_PASSPHRASE50968
+Node: Agent PRESET_PASSPHRASE51359
+Node: Agent GET_CONFIRMATION52197
+Node: Agent HAVEKEY52869
+Node: Agent LEARN53501
+Node: Agent PASSWD53799
+Node: Agent UPDATESTARTUPTTY54265
+Node: Agent GETEVENTCOUNTER54743
+Node: Agent GETINFO55551
+Node: Agent OPTION56255
+Node: Invoking DIRMNGR59313
+Node: Dirmngr Commands60211
+Node: Dirmngr Options62580
+Ref: Dirmngr Options-Footnote-181039
+Node: Dirmngr Configuration81174
+Node: Dirmngr Signals86052
+Node: Dirmngr Examples87080
+Node: Dirmngr Protocol87762
+Node: Dirmngr LOOKUP88412
+Node: Dirmngr ISVALID89783
+Node: Dirmngr CHECKCRL92356
+Node: Dirmngr CHECKOCSP93413
+Node: Dirmngr CACHECERT94719
+Node: Dirmngr VALIDATE95558
+Node: Invoking GPG96126
+Node: GPG Commands97356
+Node: General GPG Commands98250
+Node: Operational GPG Commands98939
+Ref: option --export-ownertrust116240
+Node: OpenPGP Key Management118896
+Node: GPG Options142119
+Node: GPG Configuration Options143452
+Ref: gpg-option --options156903
+Ref: trust-model-tofu161471
+Node: GPG Key related Options181422
+Node: GPG Input and Output187743
+Node: OpenPGP Options201751
+Node: Compliance Options207554
+Node: GPG Esoteric Options211235
+Ref: GPG Esoteric Options-Footnote-1241332
+Node: Deprecated Options241486
+Node: GPG Configuration242989
+Node: GPG Examples248865
+Node: Unattended Usage of GPG257676
+Node: Programmatic use of GnuPG258307
+Node: Ephemeral home directories258858
+Node: The quick key manipulation interface260165
+Node: Unattended GPG key generation260752
+Node: Invoking GPGSM270071
+Node: GPGSM Commands270940
+Node: General GPGSM Commands271378
+Node: Operational GPGSM Commands272066
+Node: Certificate Management274100
+Node: GPGSM Options279546
+Node: Configuration Options280120
+Ref: gpgsm-option --options280389
+Node: Certificate Options283578
+Ref: gpgsm-option --validation-model287182
+Node: Input and Output288162
+Ref: option --p12-charset288745
+Ref: gpgsm-option --with-key-data289989
+Ref: gpgsm-option --with-validation290263
+Node: CMS Options291141
+Node: Esoteric Options292161
+Node: GPGSM Configuration299480
+Node: GPGSM Examples305983
+Node: Unattended Usage306180
+Node: Automated signature checking306771
+Node: CSR and certificate creation308594
+Node: GPGSM Protocol314253
+Node: GPGSM ENCRYPT315509
+Node: GPGSM DECRYPT318184
+Node: GPGSM SIGN319020
+Node: GPGSM VERIFY320476
+Node: GPGSM GENKEY320992
+Node: GPGSM LISTKEYS322007
+Ref: gpgsm-cmd listkeys322166
+Node: GPGSM EXPORT322919
+Node: GPGSM IMPORT323883
+Node: GPGSM DELETE324624
+Node: GPGSM GETAUDITLOG325131
+Ref: gpgsm-cmd getauditlog325300
+Node: GPGSM GETINFO325644
+Node: GPGSM OPTION326493
+Node: Invoking SCDAEMON329846
+Node: Scdaemon Commands330520
+Node: Scdaemon Options331648
+Node: Card applications340674
+Node: OpenPGP Card341339
+Node: NKS Card341812
+Node: DINSIG Card342138
+Node: PKCS#15 Card342514
+Node: Geldkarte Card342784
+Node: SmartCard-HSM343175
+Node: Undefined Card343771
+Node: Scdaemon Configuration344184
+Node: Scdaemon Examples345222
+Node: Scdaemon Protocol345405
+Node: Scdaemon SERIALNO346924
+Node: Scdaemon LEARN347770
+Node: Scdaemon READCERT348617
+Node: Scdaemon READKEY349019
+Node: Scdaemon PKSIGN349305
+Node: Scdaemon PKDECRYPT350031
+Node: Scdaemon GETATTR350781
+Node: Scdaemon SETATTR350983
+Node: Scdaemon WRITEKEY351188
+Node: Scdaemon GENKEY351890
+Node: Scdaemon RANDOM352093
+Node: Scdaemon PASSWD352316
+Node: Scdaemon CHECKPIN352707
+Node: Scdaemon RESTART353710
+Node: Scdaemon APDU354243
+Node: Specify a User ID355216
+Ref: how-to-specify-a-user-id355374
+Node: Trust Values360232
+Ref: trust-values360364
+Node: Smart Card Tool360969
+Node: gpg-card361315
+Node: Helper Tools390615
+Node: watchgnupg391472
+Ref: option watchgnupg --tcp392829
+Node: gpgv394493
+Node: addgnupghome399700
+Node: gpgconf400398
+Ref: gpgconf-Footnote-1402587
+Node: Invoking gpgconf402885
+Node: Format conventions410034
+Node: Listing components415367
+Node: Checking programs417452
+Node: Listing options420192
+Node: Changing options427690
+Node: Listing global options429394
+Node: Querying versions431376
+Node: Files used by gpgconf434076
+Node: applygnupgdefaults434684
+Node: gpg-preset-passphrase435556
+Node: Invoking gpg-preset-passphrase436593
+Node: gpg-connect-agent437997
+Node: Invoking gpg-connect-agent438713
+Node: Controlling gpg-connect-agent443361
+Node: dirmngr-client449888
+Node: gpgparsemail453241
+Node: gpgtar453556
+Node: gpg-check-pattern458359
+Node: Web Key Service460663
+Node: gpg-wks-client460976
+Node: gpg-wks-server465844
+Node: Howtos471266
+Node: Howto Create a Server Cert471538
+Node: System Notes479951
+Node: W32 Notes481162
+Node: Debugging481584
+Node: Debugging Tools482412
+Node: kbxutil482692
+Node: Debugging Hints484223
+Node: Common Problems485354
+Node: Architecture Details490591
+Node: Component interaction490901
+Ref: fig:moduleoverview491087
+Node: GnuPG-1 and GnuPG-2491194
+Ref: fig:cardarchitecture491484
+Node: Copying491599
+Node: Contributors529123
+Node: Glossary535378
+Node: Option Index537897
+Node: Environment Index625337
+Node: Index631003
 
 End Tag Table
diff --git a/doc/gnupg.info-1 b/doc/gnupg.info-1
index 353f323..e2164dc 100644
--- a/doc/gnupg.info-1
+++ b/doc/gnupg.info-1
@@ -1,6 +1,6 @@
 This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
 
-This is the 'The GNU Privacy Guard Manual' (version 2.3.5-beta20, March
+This is the 'The GNU Privacy Guard Manual' (version 2.3.7-beta30, June
 2022).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
@@ -27,7 +27,7 @@ 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.5-beta20, March
+This is the 'The GNU Privacy Guard Manual' (version 2.3.7-beta30, June
 2022).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
@@ -214,9 +214,8 @@ only one command is allowed.
 '--supervised'
      Run in the foreground, sending logs by default to stderr, and
      listening on provided file descriptors, which must already be bound
-     to listening sockets.  This command is useful when running under
-     systemd or other similar process supervision schemes.  This option
-     is not supported on Windows.
+     to listening sockets.  This option is deprecated and not supported
+     on Windows.
 
      In -supervised mode, different file descriptors can be provided for
      use as different socket types (e.g.  ssh, extra) as long as they
@@ -378,6 +377,17 @@ the two leading dashes, in the configuration file.
      the 'trustlist.txt' file.  This makes it harder for users to
      inadvertently accept Root-CA keys.
 
+'--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::.
+
+'--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').
+
 '--allow-preset-passphrase'
      This option allows the use of 'gpg-preset-passphrase' to seed the
      internal cache of 'gpg-agent' with passphrases.
@@ -738,7 +748,9 @@ agent.  By default they may all be found in the current home directory
 
      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.
+     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:
@@ -1550,9 +1562,7 @@ only one command is allowed.
 '--supervised'
      Run in the foreground, sending logs to stderr, and listening on
      file descriptor 3, which must already be bound to a listening
-     socket.  This is useful when running under systemd or other similar
-     process supervision schemes.  This option is not supported on
-     Windows.
+     socket.  This option is deprecated and not supported on Windows.
 
 '--list-crls'
      List the contents of the CRL cache on 'stdout'.  This is probably
@@ -2864,12 +2874,13 @@ File: gnupg.info,  Node: Operational GPG Commands,  Next: OpenPGP Key Management
      STDIN. With the second form (or a deprecated "*" for ALGO) digests
      for all available algorithms are printed.
 
-'--gen-random 0|1|2 COUNT'
+'--gen-random 0|1|2|16|30 COUNT'
      Emit COUNT random bytes of the given quality level 0, 1 or 2.  If
      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.  PLEASE, don't use this command unless you know what you
-     are doing; it may remove precious entropy from the system!
+     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.
 
 '--gen-prime MODE BITS'
      Use the source, Luke :-).  The output format is subject to change
@@ -6895,6 +6906,14 @@ File: gnupg.info,  Node: Esoteric Options,  Prev: CMS Options,  Up: GPGSM Option
      that they are included anyway if the key specification for a
      listing is given as fingerprint or keygrip.
 
+'--compatibility-flags FLAGS'
+     Set compatibility flags to work around problems due to
+     non-compliant certificates or data.  The FLAGS are given as a comma
+     separated list of flag names and are OR-ed together.  The special
+     flag "none" clears the list and allows to start over with an empty
+     list.  To get a list of available flags the sole word "help" can be
+     used.
+
 '--debug-level LEVEL'
      Select the debug level for investigating problems.  LEVEL may be a
      numeric value or by a keyword:
diff --git a/doc/gnupg.info-2 b/doc/gnupg.info-2
index 3c06a6e..b6b0ba6 100644
--- a/doc/gnupg.info-2
+++ b/doc/gnupg.info-2
@@ -1,6 +1,6 @@
 This is gnupg.info, produced by makeinfo version 6.5 from gnupg.texi.
 
-This is the 'The GNU Privacy Guard Manual' (version 2.3.5-beta20, March
+This is the 'The GNU Privacy Guard Manual' (version 2.3.7-beta30, June
 2022).
 
    (C) 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
@@ -836,10 +836,11 @@ File: gnupg.info,  Node: Scdaemon Options,  Next: Card applications,  Prev: Scda
      this option only if you know what you are doing.
 
 '--pcsc-driver LIBRARY'
-     Use LIBRARY to access the smartcard reader.  The current default is
-     'libpcsclite.so'.  Instead of using this option you might also want
-     to install a symbolic link to the default file name (e.g.  from
-     'libpcsclite.so.1').
+     Use LIBRARY to access the smartcard reader.  The current default on
+     Unix is 'libpcsclite.so' and on Windows 'winscard.dll'.  Instead of
+     using this option you might also want to install a symbolic link to
+     the default file name (e.g.  from 'libpcsclite.so.1').  A Unicode
+     file name may not be used on Windows.
 
 '--ctapi-driver LIBRARY'
      Use LIBRARY to access the smartcard reader.  The current default is
@@ -3555,6 +3556,11 @@ The following options may be used:
      Decode data lines.  That is to remove percent escapes but make sure
      that a new line always starts with a D and a space.
 
+'-u'
+'--unbuffered'
+     Set stdin and stdout into unbuffered I/O mode.  This this sometimes
+     useful for scripting.
+
 
 File: gnupg.info,  Node: Controlling gpg-connect-agent,  Prev: Invoking gpg-connect-agent,  Up: gpg-connect-agent
 
@@ -5812,17 +5818,17 @@ Option Index
 * agent-program <2>:                     gpg-card.            (line  64)
 * agent-program <3>:                     Invoking gpg-connect-agent.
                                                               (line  87)
-* allow-admin:                           Scdaemon Options.    (line 175)
-* allow-emacs-pinentry:                  Agent Options.       (line 178)
+* allow-admin:                           Scdaemon Options.    (line 176)
+* allow-emacs-pinentry:                  Agent Options.       (line 189)
 * allow-freeform-uid:                    GPG Esoteric Options.
                                                               (line 395)
-* allow-loopback-pinentry:               Agent Options.       (line 160)
+* allow-loopback-pinentry:               Agent Options.       (line 171)
 * allow-non-selfsigned-uid:              GPG Esoteric Options.
                                                               (line 390)
 * allow-ocsp:                            Dirmngr Options.     (line 331)
 * allow-old-cipher-algos:                GPG Esoteric Options.
                                                               (line 431)
-* allow-preset-passphrase:               Agent Options.       (line 155)
+* allow-preset-passphrase:               Agent Options.       (line 166)
 * allow-secret-key-import:               GPG Esoteric Options.
                                                               (line 601)
 * allow-version-check:                   Dirmngr Options.     (line 138)
@@ -5831,7 +5837,7 @@ Option Index
 * allow-weak-key-signatures:             GPG Esoteric Options.
                                                               (line 455)
 * always-trust:                          Deprecated Options.  (line  21)
-* application-priority:                  Scdaemon Options.    (line 190)
+* application-priority:                  Scdaemon Options.    (line 191)
 * armor:                                 GPG Input and Output.
                                                               (line   8)
 * armor <1>:                             Input and Output.    (line   8)
@@ -5851,7 +5857,7 @@ Option Index
 * authenticate:                          gpg-card.            (line  94)
 * auto-check-trustdb:                    GPG Configuration Options.
                                                               (line 728)
-* auto-expand-secmem:                    Agent Options.       (line 426)
+* auto-expand-secmem:                    Agent Options.       (line 437)
 * auto-issuer-key-retrieve:              Certificate Options. (line  62)
 * auto-key-import:                       GPG Configuration Options.
                                                               (line 573)
@@ -5879,7 +5885,7 @@ Option Index
                                                               (line 210)
 * card-status:                           Operational GPG Commands.
                                                               (line 216)
-* card-timeout:                          Scdaemon Options.    (line 159)
+* card-timeout:                          Scdaemon Options.    (line 160)
 * cert-digest-algo:                      GPG Esoteric Options.
                                                               (line 263)
 * cert-notation:                         GPG Esoteric Options.
@@ -5893,12 +5899,12 @@ Option Index
 * change-pin:                            Operational GPG Commands.
                                                               (line 219)
 * check:                                 gpg-check-pattern.   (line  56)
-* check-passphrase-pattern:              Agent Options.       (line 232)
+* check-passphrase-pattern:              Agent Options.       (line 243)
 * check-signatures:                      Operational GPG Commands.
                                                               (line 140)
 * check-sigs:                            Operational GPG Commands.
                                                               (line 141)
-* check-sym-passphrase-pattern:          Agent Options.       (line 232)
+* check-sym-passphrase-pattern:          Agent Options.       (line 243)
 * check-trustdb:                         Operational GPG Commands.
                                                               (line 349)
 * chuid:                                 GPG Esoteric Options.
@@ -5924,6 +5930,7 @@ Option Index
                                                               (line 385)
 * comment:                               GPG Esoteric Options.
                                                               (line 118)
+* compatibility-flags:                   Esoteric Options.    (line  66)
 * compliance:                            Compliance Options.  (line  60)
 * compliance <1>:                        Esoteric Options.    (line  27)
 * compliant-needed:                      GPG Configuration Options.
@@ -5938,31 +5945,31 @@ Option Index
 * create-socketdir:                      Invoking gpgconf.    (line  96)
 * csh:                                   Agent Options.       (line 129)
 * csh <1>:                               Dirmngr Options.     (line  87)
-* ctapi-driver:                          Scdaemon Options.    (line 136)
+* ctapi-driver:                          Scdaemon Options.    (line 137)
 * daemon:                                Agent Commands.      (line  27)
 * daemon <1>:                            Dirmngr Commands.    (line  27)
 * daemon <2>:                            Scdaemon Commands.   (line  31)
 * dearmor:                               Operational GPG Commands.
-                                                              (line 403)
+                                                              (line 404)
 * debug:                                 Agent Options.       (line  82)
 * debug <1>:                             Dirmngr Options.     (line  59)
 * debug <2>:                             GPG Esoteric Options.
                                                               (line  47)
-* debug <3>:                             Esoteric Options.    (line  91)
+* 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)
-* debug-all <3>:                         Esoteric Options.    (line 101)
+* debug-all <3>:                         Esoteric Options.    (line 109)
 * debug-all <4>:                         Scdaemon Options.    (line  76)
-* debug-allow-core-dump:                 Esoteric Options.    (line 104)
+* debug-allow-core-dump:                 Esoteric Options.    (line 112)
 * debug-allow-core-dump <1>:             Scdaemon Options.    (line  93)
 * debug-allow-large-chunks:              GPG Esoteric Options.
                                                               (line  66)
 * debug-assuan-log-cats:                 Scdaemon Options.    (line 102)
 * debug-disable-ticker:                  Scdaemon Options.    (line  89)
-* debug-ignore-expiration:               Esoteric Options.    (line 115)
+* debug-ignore-expiration:               Esoteric Options.    (line 123)
 * debug-iolbf:                           GPG Esoteric Options.
                                                               (line  57)
 * debug-iolbf <1>:                       GPG Esoteric Options.
@@ -5971,10 +5978,10 @@ Option Index
 * debug-level <1>:                       Dirmngr Options.     (line  34)
 * debug-level <2>:                       GPG Esoteric Options.
                                                               (line  22)
-* debug-level <3>:                       Esoteric Options.    (line  66)
+* debug-level <3>:                       Esoteric Options.    (line  74)
 * debug-level <4>:                       Scdaemon Options.    (line  40)
 * debug-log-tid:                         Scdaemon Options.    (line  99)
-* debug-no-chain-validation:             Esoteric Options.    (line 111)
+* debug-no-chain-validation:             Esoteric Options.    (line 119)
 * debug-pinentry:                        Agent Options.       (line 109)
 * debug-quick-random:                    Agent Options.       (line  97)
 * debug-wait:                            Agent Options.       (line  92)
@@ -5990,8 +5997,8 @@ Option Index
 * decrypt <2>:                           gpgtar.              (line  29)
 * decrypt-files:                         Operational GPG Commands.
                                                               (line 114)
-* default-cache-ttl:                     Agent Options.       (line 189)
-* default-cache-ttl <1>:                 Agent Options.       (line 198)
+* default-cache-ttl:                     Agent Options.       (line 200)
+* default-cache-ttl <1>:                 Agent Options.       (line 209)
 * default-cert-expire:                   GPG Esoteric Options.
                                                               (line 567)
 * default-cert-level:                    GPG Configuration Options.
@@ -6019,7 +6026,7 @@ Option Index
                                                               (line 244)
 * delete-secret-keys:                    Operational GPG Commands.
                                                               (line 233)
-* deny-admin:                            Scdaemon Options.    (line 175)
+* deny-admin:                            Scdaemon Options.    (line 176)
 * desig-revoke:                          OpenPGP Key Management.
                                                               (line 134)
 * detach-sign:                           Operational GPG Commands.
@@ -6037,16 +6044,16 @@ Option Index
                                                               (line  61)
 * dirmngr-program <2>:                   Invoking gpg-connect-agent.
                                                               (line  94)
-* disable-application:                   Scdaemon Options.    (line 185)
-* disable-ccid:                          Scdaemon Options.    (line 141)
-* disable-check-own-socket:              Agent Options.       (line 314)
+* disable-application:                   Scdaemon Options.    (line 186)
+* disable-ccid:                          Scdaemon Options.    (line 142)
+* disable-check-own-socket:              Agent Options.       (line 325)
 * disable-check-own-socket <1>:          Dirmngr Options.     (line  79)
 * disable-cipher-algo:                   GPG Esoteric Options.
                                                               (line 274)
 * disable-crl-checks:                    Certificate Options. (line  13)
 * disable-dsa2:                          GPG Configuration Options.
                                                               (line 190)
-* disable-extended-key-format:           Agent Options.       (line 360)
+* 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)
@@ -6055,14 +6062,14 @@ Option Index
 * disable-ldap:                          Dirmngr Options.     (line 214)
 * disable-mdc:                           OpenPGP Options.     (line  30)
 * disable-ocsp:                          Certificate Options. (line  53)
-* disable-pinpad:                        Scdaemon Options.    (line 172)
+* disable-pinpad:                        Scdaemon Options.    (line 173)
 * disable-policy-checks:                 Certificate Options. (line   8)
 * disable-pubkey-algo:                   GPG Esoteric Options.
                                                               (line 279)
-* disable-scdaemon:                      Agent Options.       (line 308)
+* disable-scdaemon:                      Agent Options.       (line 319)
 * disable-signer-uid:                    OpenPGP Options.     (line  37)
 * disable-trusted-cert-crl-check:        Certificate Options. (line  24)
-* display:                               Agent Options.       (line 332)
+* display:                               Agent Options.       (line 343)
 * display-charset:                       GPG Configuration Options.
                                                               (line 279)
 * display-charset:iso-8859-1:            GPG Configuration Options.
@@ -6104,24 +6111,24 @@ Option Index
 * enable-crl-checks:                     Certificate Options. (line  13)
 * enable-dsa2:                           GPG Configuration Options.
                                                               (line 190)
-* enable-extended-key-format:            Agent Options.       (line 360)
+* 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)
 * enable-ocsp:                           Certificate Options. (line  53)
-* enable-passphrase-history:             Agent Options.       (line 255)
-* enable-pinpad-varlen:                  Scdaemon Options.    (line 164)
+* enable-passphrase-history:             Agent Options.       (line 266)
+* enable-pinpad-varlen:                  Scdaemon Options.    (line 165)
 * enable-policy-checks:                  Certificate Options. (line   8)
 * enable-progress-filter:                GPG Esoteric Options.
                                                               (line  86)
-* enable-putty-support:                  Agent Options.       (line 372)
+* enable-putty-support:                  Agent Options.       (line 383)
 * enable-special-filenames:              GPG Esoteric Options.
                                                               (line 609)
 * enable-special-filenames <1>:          gpgv.                (line  97)
-* enable-ssh-support:                    Agent Options.       (line 372)
+* enable-ssh-support:                    Agent Options.       (line 383)
 * enable-trusted-cert-crl-check:         Certificate Options. (line  24)
 * enarmor:                               Operational GPG Commands.
-                                                              (line 403)
+                                                              (line 404)
 * encrypt:                               Operational GPG Commands.
                                                               (line  32)
 * encrypt <1>:                           Operational GPGSM Commands.
@@ -6131,7 +6138,7 @@ Option Index
                                                               (line 111)
 * encrypt-to:                            GPG Key related Options.
                                                               (line  35)
-* enforce-passphrase-constraints:        Agent Options.       (line 216)
+* enforce-passphrase-constraints:        Agent Options.       (line 227)
 * escape-from-lines:                     GPG Esoteric Options.
                                                               (line 304)
 * exec:                                  Invoking gpg-connect-agent.
@@ -6165,7 +6172,7 @@ Option Index
 * export-ssh-key:                        Operational GPG Commands.
                                                               (line 290)
 * extra-digest-algo:                     Esoteric Options.    (line  16)
-* extra-socket:                          Agent Options.       (line 346)
+* extra-socket:                          Agent Options.       (line 357)
 * extract:                               gpgtar.              (line  19)
 * factory-reset:                         gpg-card.            (line 107)
 * faked-system-time:                     Agent Options.       (line  52)
@@ -6175,14 +6182,14 @@ Option Index
 * fast-list-mode:                        GPG Esoteric Options.
                                                               (line 502)
 * fetch:                                 gpg-card.            (line 112)
-* fetch-crl:                             Dirmngr Commands.    (line  52)
+* fetch-crl:                             Dirmngr Commands.    (line  50)
 * fetch-keys:                            Operational GPG Commands.
                                                               (line 333)
 * fingerprint:                           Operational GPG Commands.
                                                               (line 194)
 * fixed-list-mode:                       GPG Input and Output.
                                                               (line 290)
-* flush:                                 Dirmngr Commands.    (line  62)
+* flush:                                 Dirmngr Commands.    (line  60)
 * for-your-eyes-only:                    GPG Esoteric Options.
                                                               (line 200)
 * forbid-gen-key:                        GPG Esoteric Options.
@@ -6210,7 +6217,7 @@ Option Index
 * gen-key <1>:                           Certificate Management.
                                                               (line   8)
 * gen-prime:                             Operational GPG Commands.
-                                                              (line 398)
+                                                              (line 399)
 * gen-random:                            Operational GPG Commands.
                                                               (line 391)
 * gen-revoke:                            OpenPGP Key Management.
@@ -6272,7 +6279,7 @@ Option Index
                                                               (line  43)
 * honor-http-proxy:                      Dirmngr Options.     (line 236)
 * http-proxy:                            Dirmngr Options.     (line 240)
-* ignore-cache-for-signing:              Agent Options.       (line 183)
+* ignore-cache-for-signing:              Agent Options.       (line 194)
 * ignore-cert:                           Dirmngr Options.     (line 390)
 * ignore-cert-extension:                 Dirmngr Options.     (line 380)
 * ignore-cert-extension <1>:             Certificate Options. (line  82)
@@ -6306,8 +6313,8 @@ Option Index
 * interactive:                           GPG Esoteric Options.
                                                               (line  19)
 * kdf-setup:                             gpg-card.            (line 126)
-* keep-display:                          Agent Options.       (line 337)
-* keep-tty:                              Agent Options.       (line 337)
+* keep-display:                          Agent Options.       (line 348)
+* keep-tty:                              Agent Options.       (line 348)
 * key-origin:                            GPG Input and Output.
                                                               (line  45)
 * keyboxd:                               Invoking gpg-connect-agent.
@@ -6413,8 +6420,8 @@ Option Index
                                                               (line 166)
 * lang:                                  gpg-card.            (line 129)
 * launch:                                Invoking gpgconf.    (line  80)
-* lc-ctype:                              Agent Options.       (line 332)
-* lc-messages:                           Agent Options.       (line 332)
+* lc-ctype:                              Agent Options.       (line 343)
+* lc-messages:                           Agent Options.       (line 343)
 * ldap-proxy:                            Dirmngr Options.     (line 245)
 * ldapserver:                            Dirmngr Options.     (line 275)
 * ldapserverlist-file:                   Dirmngr Options.     (line 256)
@@ -6431,7 +6438,7 @@ Option Index
                                                               (line  32)
 * list-config:                           GPG Esoteric Options.
                                                               (line 632)
-* list-crls:                             Dirmngr Commands.    (line  40)
+* list-crls:                             Dirmngr Commands.    (line  38)
 * list-gcrypt-config:                    GPG Esoteric Options.
                                                               (line 640)
 * list-keys:                             Operational GPG Commands.
@@ -6484,10 +6491,10 @@ Option Index
                                                               (line 490)
 * list-sigs:                             GPG Esoteric Options.
                                                               (line 491)
-* listen-backlog:                        Agent Options.       (line 342)
+* listen-backlog:                        Agent Options.       (line 353)
 * listen-backlog <1>:                    Dirmngr Options.     (line 134)
 * listen-backlog <2>:                    Scdaemon Options.    (line 115)
-* load-crl:                              Dirmngr Commands.    (line  44)
+* load-crl:                              Dirmngr Commands.    (line  42)
 * load-crl <1>:                          dirmngr-client.      (line  80)
 * local-user:                            GPG Key related Options.
                                                               (line  77)
@@ -6522,18 +6529,18 @@ Option Index
                                                               (line 350)
 * marginals-needed:                      GPG Configuration Options.
                                                               (line 707)
-* max-cache-ttl:                         Agent Options.       (line 204)
-* max-cache-ttl-ssh:                     Agent Options.       (line 210)
+* max-cache-ttl:                         Agent Options.       (line 215)
+* max-cache-ttl-ssh:                     Agent Options.       (line 221)
 * max-cert-depth:                        GPG Configuration Options.
                                                               (line 715)
 * max-output:                            GPG Input and Output.
                                                               (line  19)
-* max-passphrase-days:                   Agent Options.       (line 250)
+* max-passphrase-days:                   Agent Options.       (line 261)
 * max-replies:                           Dirmngr Options.     (line 377)
 * min-cert-level:                        GPG Configuration Options.
                                                               (line 395)
-* min-passphrase-len:                    Agent Options.       (line 220)
-* min-passphrase-nonalpha:               Agent Options.       (line 225)
+* min-passphrase-len:                    Agent Options.       (line 231)
+* min-passphrase-nonalpha:               Agent Options.       (line 236)
 * min-rsa-length:                        Compliance Options.  (line  65)
 * min-rsa-length <1>:                    Esoteric Options.    (line  31)
 * multi-server:                          Scdaemon Commands.   (line  26)
@@ -6544,8 +6551,8 @@ Option Index
 * no:                                    GPG Configuration Options.
                                                               (line  67)
 * no <1>:                                gpgtar.              (line 113)
-* no-allow-external-cache:               Agent Options.       (line 168)
-* no-allow-loopback-pinentry:            Agent Options.       (line 160)
+* no-allow-external-cache:               Agent Options.       (line 179)
+* no-allow-loopback-pinentry:            Agent Options.       (line 171)
 * no-allow-mark-trusted:                 Agent Options.       (line 150)
 * no-armor:                              GPG Input and Output.
                                                               (line  12)
@@ -6564,7 +6571,7 @@ Option Index
                                                               (line  78)
 * no-batch:                              GPG Configuration Options.
                                                               (line  45)
-* no-common-certs-import:                Esoteric Options.    (line 152)
+* no-common-certs-import:                Esoteric Options.    (line 160)
 * no-default-keyring:                    GPG Esoteric Options.
                                                               (line 468)
 * no-default-recipient:                  GPG Configuration Options.
@@ -6605,8 +6612,9 @@ Option Index
                                                               (line 365)
 * no-tty:                                GPG Configuration Options.
                                                               (line  58)
-* no-use-standard-socket:                Agent Options.       (line 322)
+* no-use-standard-socket:                Agent Options.       (line 333)
 * no-use-tor:                            Dirmngr Options.     (line  98)
+* no-user-trustlist:                     Agent Options.       (line 155)
 * no-verbose:                            GPG Configuration Options.
                                                               (line  37)
 * not-dash-escaped:                      GPG Esoteric Options.
@@ -6646,7 +6654,7 @@ Option Index
                                                               (line  36)
 * passphrase-fd:                         GPG Esoteric Options.
                                                               (line 319)
-* passphrase-fd <1>:                     Esoteric Options.    (line 120)
+* passphrase-fd <1>:                     Esoteric Options.    (line 128)
 * passphrase-file:                       GPG Esoteric Options.
                                                               (line 329)
 * passphrase-repeat:                     GPG Esoteric Options.
@@ -6670,14 +6678,14 @@ Option Index
 * pgp8:                                  Compliance Options.  (line  53)
 * photo-viewer:                          GPG Configuration Options.
                                                               (line 196)
-* pinentry-formatted-passphrase:         Agent Options.       (line 269)
-* pinentry-invisible-char:               Agent Options.       (line 258)
+* pinentry-formatted-passphrase:         Agent Options.       (line 280)
+* pinentry-invisible-char:               Agent Options.       (line 269)
 * pinentry-mode:                         GPG Esoteric Options.
                                                               (line 350)
-* pinentry-mode <1>:                     Esoteric Options.    (line 129)
-* pinentry-program:                      Agent Options.       (line 282)
-* pinentry-timeout:                      Agent Options.       (line 263)
-* pinentry-touch-file:                   Agent Options.       (line 295)
+* pinentry-mode <1>:                     Esoteric Options.    (line 137)
+* pinentry-program:                      Agent Options.       (line 293)
+* pinentry-timeout:                      Agent Options.       (line 274)
+* pinentry-touch-file:                   Agent Options.       (line 306)
 * ping:                                  dirmngr-client.      (line  69)
 * policy-file:                           Configuration Options.
                                                               (line  51)
@@ -6731,7 +6739,7 @@ Option Index
 * raw-socket:                            Invoking gpg-connect-agent.
                                                               (line  22)
 * readcert:                              gpg-card.            (line 180)
-* reader-port:                           Scdaemon Options.    (line 147)
+* reader-port:                           Scdaemon Options.    (line 148)
 * rebuild-keydb-caches:                  Operational GPG Commands.
                                                               (line 380)
 * receive-keys:                          Operational GPG Commands.
@@ -6751,7 +6759,7 @@ Option Index
 * remove-socketdir:                      Invoking gpgconf.    (line 102)
 * request-origin:                        GPG Esoteric Options.
                                                               (line 370)
-* request-origin <1>:                    Esoteric Options.    (line 144)
+* 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)
@@ -6767,15 +6775,15 @@ Option Index
 * run:                                   Invoking gpg-connect-agent.
                                                               (line 105)
 * s:                                     Dirmngr Options.     (line  87)
-* s2k-calibration:                       Agent Options.       (line 435)
+* s2k-calibration:                       Agent Options.       (line 446)
 * s2k-cipher-algo:                       OpenPGP Options.     (line  94)
-* s2k-count:                             Agent Options.       (line 442)
+* 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)
 * salut:                                 gpg-card.            (line 191)
 * salutation:                            gpg-card.            (line 191)
-* scdaemon-program:                      Agent Options.       (line 304)
+* scdaemon-program:                      Agent Options.       (line 315)
 * search-keys:                           Operational GPG Commands.
                                                               (line 323)
 * secret-keyring:                        GPG Configuration Options.
@@ -6812,7 +6820,7 @@ Option Index
 * show-policy-url:                       Deprecated Options.  (line  33)
 * show-session-key:                      GPG Esoteric Options.
                                                               (line 518)
-* shutdown:                              Dirmngr Commands.    (line  58)
+* shutdown:                              Dirmngr Commands.    (line  56)
 * sig-keyserver-url:                     GPG Esoteric Options.
                                                               (line 185)
 * sig-notation:                          GPG Esoteric Options.
@@ -6831,7 +6839,7 @@ Option Index
 * skip-verify:                           GPG Esoteric Options.
                                                               (line 482)
 * squid-mode:                            dirmngr-client.      (line 101)
-* ssh-fingerprint-digest:                Agent Options.       (line 420)
+* ssh-fingerprint-digest:                Agent Options.       (line 431)
 * standard-resolver:                     Dirmngr Options.     (line 110)
 * status-fd:                             GPG Esoteric Options.
                                                               (line  91)
@@ -6851,6 +6859,7 @@ Option Index
 * supervised <1>:                        Dirmngr Commands.    (line  33)
 * symmetric:                             Operational GPG Commands.
                                                               (line  42)
+* sys-trustlist-name:                    Agent Options.       (line 160)
 * tar:                                   gpgtar.              (line 147)
 * tar-args:                              gpgtar.              (line 141)
 * textmode:                              OpenPGP Options.     (line   8)
@@ -6861,7 +6870,7 @@ Option Index
 * tofu-default-policy:                   GPG Configuration Options.
                                                               (line 711)
 * tofu-policy:                           Operational GPG Commands.
-                                                              (line 417)
+                                                              (line 418)
 * trust-model:                           GPG Configuration Options.
                                                               (line 410)
 * trust-model:always:                    GPG Configuration Options.
@@ -6886,14 +6895,16 @@ Option Index
                                                               (line 119)
 * try-secret-key:                        GPG Key related Options.
                                                               (line 108)
-* ttyname:                               Agent Options.       (line 332)
-* ttytype:                               Agent Options.       (line 332)
+* ttyname:                               Agent Options.       (line 343)
+* ttytype:                               Agent Options.       (line 343)
 * uif:                                   gpg-card.            (line 196)
 * unblock:                               gpg-card.            (line 202)
+* unbuffered:                            Invoking gpg-connect-agent.
+                                                              (line 123)
 * ungroup:                               GPG Key related Options.
                                                               (line  70)
 * unwrap:                                Operational GPG Commands.
-                                                              (line 409)
+                                                              (line 410)
 * update-trustdb:                        Operational GPG Commands.
                                                               (line 339)
 * url:                                   gpg-card.            (line 207)
@@ -6903,8 +6914,8 @@ Option Index
                                                               (line 735)
 * use-embedded-filename:                 GPG Esoteric Options.
                                                               (line 209)
-* use-standard-socket:                   Agent Options.       (line 322)
-* use-standard-socket-p:                 Agent Options.       (line 322)
+* 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)
@@ -7011,7 +7022,7 @@ Option Index
                                                               (line 327)
 * writecert:                             gpg-card.            (line 217)
 * writekey:                              gpg-card.            (line 224)
-* xauthority:                            Agent Options.       (line 332)
+* xauthority:                            Agent Options.       (line 343)
 * yes:                                   GPG Configuration Options.
                                                               (line  63)
 * yes <1>:                               gpgtar.              (line 108)
diff --git a/doc/gnupg.info-3 b/doc/gnupg.info-3
index 18b5dd3..6191194 100644
--- a/doc/gnupg.info-3
+++ b/doc/gnupg.info-3
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 6a3f0bf..1655847 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -171,9 +171,8 @@ shell, gpg-agent terminates within a few seconds.
 @opindex supervised
 Run in the foreground, sending logs by default to stderr, and
 listening on provided file descriptors, which must already be bound to
-listening sockets.  This command is useful when running under systemd
-or other similar process supervision schemes.  This option is not
-supported on Windows.
+listening sockets.  This option is deprecated and not supported on
+Windows.
 
 In --supervised mode, different file descriptors can be provided for
 use as different socket types (e.g. ssh, extra) as long as they are
@@ -347,6 +346,21 @@ Do not allow clients to mark keys as trusted, i.e. put them into the
 @file{trustlist.txt} file.  This makes it harder for users to inadvertently
 accept Root-CA keys.
 
+
+@anchor{option --no-user-trustlist}
+@item --no-user-trustlist
+@opindex no-user-trustlist
+Entirely ignore the user trust list and consider only the global
+trustlist (@file{@value{SYSCONFDIR}/trustlist.txt}).  This
+implies the @ref{option --no-allow-mark-trusted}.
+
+@item --sys-trustlist-name @var{file}
+@opindex sys-trustlist-name
+Changes the default name for the global trustlist from "trustlist.txt"
+to @var{file}.  If @var{file} does not contain any slashes and does
+not start with "~/" it is searched in the system configuration
+directory (@file{@value{SYSCONFDIR}}).
+
 @anchor{option --allow-preset-passphrase}
 @item --allow-preset-passphrase
 @opindex allow-preset-passphrase
@@ -774,7 +788,9 @@ that this file can't be changed inadvertently.
 
 As a special feature a line @code{include-default} will include a global
 list of trusted certificates (e.g. @file{@value{SYSCONFDIR}/trustlist.txt}).
-This global list is also used if the local list is not available.
+This global list is also used if the local list is not available;
+the @ref{option --no-user-trustlist} enforces the use of only
+this global list.
 
 It is possible to add further flags after the @code{S} for use by the
 caller:
diff --git a/doc/gpg.texi b/doc/gpg.texi
index f6c4456..08de40b 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -610,13 +610,14 @@ Print message digest of algorithm @var{algo} for all given files or STDIN.
 With the second form (or a deprecated "*" for @var{algo}) digests for all
 available algorithms are printed.
 
-@item --gen-random @var{0|1|2} @var{count}
+@item --gen-random @var{0|1|2|16|30} @var{count}
 @opindex gen-random
 Emit @var{count} random bytes of the given quality level 0, 1 or 2. If
 @var{count} is not given or zero, an endless sequence of random bytes
 will be emitted.  If used with @option{--armor} the output will be
-base64 encoded.  PLEASE, don't use this command unless you know what
-you are doing; it may remove precious entropy from the system!
+base64 encoded.  The special level 16 uses a quality level of 1 and
+outpust end endless stream of hex-encoded octets.  The special level
+30 outputs random as 30 zBase-32 characters.
 
 @item --gen-prime @var{mode}  @var{bits}
 @opindex gen-prime
diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index 57d807d..a328ea5 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -733,6 +733,14 @@ Include ephemeral flagged keys in the output of key listings.  Note
 that they are included anyway if the key specification for a listing
 is given as fingerprint or keygrip.
 
+@item --compatibility-flags @var{flags}
+@opindex compatibility-flags
+Set compatibility flags to work around problems due to non-compliant
+certificates or data.  The @var{flags} are given as a comma separated
+list of flag names and are OR-ed together.  The special flag "none"
+clears the list and allows to start over with an empty list.  To get a
+list of available flags the sole word "help" can be used.
+
 @item --debug-level @var{level}
 @opindex debug-level
 Select the debug level for investigating problems. @var{level} may be
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index 7fc32b8..b7d83aa 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -236,9 +236,10 @@ this option only if you know what you are doing.
 @item --pcsc-driver @var{library}
 @opindex pcsc-driver
 Use @var{library} to access the smartcard reader.  The current default
-is @file{libpcsclite.so}.  Instead of using this option you might also
-want to install a symbolic link to the default file name
-(e.g. from @file{libpcsclite.so.1}).
+on Unix is @file{libpcsclite.so} and on Windows @file{winscard.dll}.
+Instead of using this option you might also want to install a symbolic
+link to the default file name (e.g. from @file{libpcsclite.so.1}).
+A Unicode file name may not be used on Windows.
 
 @item --ctapi-driver @var{library}
 @opindex ctapi-driver
diff --git a/doc/tools.texi b/doc/tools.texi
index 1632b12..e22a228 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -1451,6 +1451,13 @@ non-control characters.
 Decode data lines.  That is to remove percent escapes but make sure that
 a new line always starts with a D and a space.
 
+@item -u
+@itemx --unbuffered
+@opindex unbuffered
+Set stdin and stdout into unbuffered I/O mode.  This this sometimes
+useful for scripting.
+
+
 @end table
 
 @mansect control commands
diff --git a/g10/cpr.c b/g10/cpr.c
index 002656b..fa8005d 100644
--- a/g10/cpr.c
+++ b/g10/cpr.c
@@ -372,20 +372,15 @@ write_status_text_and_buffer (int no, const char *string,
             }
           first = 0;
         }
-      for (esc=0, s=buffer, n=len; n && !esc; s++, n--)
+      for (esc=0, s=buffer, n=len; n; s++, n--)
         {
           if (*s == '%' || *(const byte*)s <= lower_limit
               || *(const byte*)s == 127 )
             esc = 1;
           if (wrap && ++count > wrap)
-            {
-              dowrap=1;
-              break;
-            }
-        }
-      if (esc)
-        {
-          s--; n++;
+            dowrap=1;
+          if (esc || dowrap)
+            break;
         }
       if (s != buffer)
         es_fwrite (buffer, s-buffer, 1, statusfp);
@@ -465,9 +460,7 @@ myread(int fd, void *buf, size_t count)
       else /* Ctrl-D not caught - do something reasonable */
         {
 #ifdef HAVE_DOSISH_SYSTEM
-#ifndef HAVE_W32CE_SYSTEM
           raise (SIGINT); /* Nothing to hangup under DOS.  */
-#endif
 #else
           raise (SIGHUP); /* No more input data.  */
 #endif
diff --git a/g10/decrypt.c b/g10/decrypt.c
index 9589aff..065601b 100644
--- a/g10/decrypt.c
+++ b/g10/decrypt.c
@@ -138,12 +138,7 @@ decrypt_message_fd (ctrl_t ctrl, int input_fd, int output_fd)
       return err;
     }
 
-#ifdef HAVE_W32CE_SYSTEM
-#warning Need to fix this if we want to use g13
-  opt.outfp = NULL;
-#else
   opt.outfp = es_fdopen_nc (output_fd, "wb");
-#endif
   if (!opt.outfp)
     {
       char xname[64];
diff --git a/g10/exec.c b/g10/exec.c
index f612c85..75b39e0 100644
--- a/g10/exec.c
+++ b/g10/exec.c
@@ -148,9 +148,6 @@ w32_system(const char *command)
 int
 set_exec_path(const char *path)
 {
-#ifdef HAVE_W32CE_SYSTEM
-#warning Change this code to use common/exechelp.c
-#else
   char *p;
 
   p=xmalloc(5+strlen(path)+1);
@@ -168,6 +165,5 @@ set_exec_path(const char *path)
     return GPG_ERR_GENERAL;
   else
     return 0;
-#endif
 }
 #endif /* ! NO_EXEC */
diff --git a/g10/export.c b/g10/export.c
index 1eec709..edf27bc 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -2066,6 +2066,12 @@ 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)
+        {
+          /* Need to merge so that for example the "usage" property
+           * has been setup.  */
+          merge_keys_and_selfsig (ctrl, keyblock);
+        }
 
       if (export_keep_uid)
         {
diff --git a/g10/gpg.c b/g10/gpg.c
index 466a48d..397f4cc 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -64,6 +64,7 @@
 #include "objcache.h"
 #include "../common/init.h"
 #include "../common/mbox-util.h"
+#include "../common/zb32.h"
 #include "../common/shareddefs.h"
 #include "../common/compliance.h"
 #include "../common/comopt.h"
@@ -5068,8 +5069,29 @@ main (int argc, char **argv)
           if (hexhack)
             level = 1;
 
+          /* Level 30 uses the same algorithm as our magic wand in
+           * pinentry/gpg-agent.  */
+          if (level == 30)
+            {
+              unsigned int nbits = 150;
+              size_t nbytes = (nbits + 7) / 8;
+              void *rand;
+              char *generated;
+
+              rand = gcry_random_bytes_secure (nbytes, GCRY_STRONG_RANDOM);
+              if (!rand)
+                log_fatal ("failed to generate random password\n");
+
+              generated = zb32_encode (rand, nbits);
+              gcry_free (rand);
+              es_fputs (generated, es_stdout);
+              es_putc ('\n', es_stdout);
+              xfree (generated);
+              break;
+            }
+
           if (argc < 1 || argc > 2 || level < 0 || level > 2 || count < 0)
-            wrong_args ("--gen-random 0|1|2 [count]");
+            wrong_args ("--gen-random 0|1|2|16|30 [count]");
 
           while (endless || count)
             {
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 122548d..e8d1dc7 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -2447,6 +2447,68 @@ keyedit_quick_adduid (ctrl_t ctrl, const char *username, const char *newuid)
 }
 
 
+/* Helper to find the UID node for namehash.  On success, returns the UID node.
+   Otherwise, return NULL. */
+kbnode_t
+find_userid_by_namehash (kbnode_t keyblock, const char *namehash)
+{
+  byte hash[NAMEHASH_LEN];
+  kbnode_t node = NULL;
+
+  if (!namehash)
+    goto leave;
+
+  if (strlen (namehash) != NAMEHASH_LEN * 2)
+    goto leave;
+
+  if (hex2bin (namehash, hash, NAMEHASH_LEN) < 0)
+    goto leave;
+
+  for (node = keyblock; node; node = node->next)
+    {
+      if (node->pkt->pkttype == PKT_USER_ID)
+	{
+	  namehash_from_uid (node->pkt->pkt.user_id);
+	  if (!memcmp (node->pkt->pkt.user_id->namehash, hash, NAMEHASH_LEN))
+	    break;
+        }
+    }
+
+ leave:
+  return node;
+}
+
+
+/* Helper to find the UID node for uid.  On success, returns the UID node.
+   Otherwise, return NULL. */
+kbnode_t
+find_userid (kbnode_t keyblock, const char *uid)
+{
+  kbnode_t node = NULL;
+  size_t uidlen;
+
+  if (!keyblock || !uid)
+    goto leave;
+
+  /* First try to find UID by namehash. */
+  node = find_userid_by_namehash (keyblock, uid);
+  if (node)
+    goto leave;
+
+  uidlen = strlen (uid);
+  for (node = keyblock; node; node = node->next)
+    {
+      if (node->pkt->pkttype == PKT_USER_ID
+          && uidlen == node->pkt->pkt.user_id->len
+          && !memcmp (node->pkt->pkt.user_id->name, uid, uidlen))
+        break;
+    }
+
+ leave:
+  return node;
+}
+
+
 /* Unattended revocation of a keyid.  USERNAME specifies the
    key. UIDTOREV is the user id revoke from the key.  */
 void
@@ -2457,7 +2519,6 @@ keyedit_quick_revuid (ctrl_t ctrl, const char *username, const char *uidtorev)
   kbnode_t keyblock = NULL;
   kbnode_t node;
   int modified = 0;
-  size_t revlen;
   size_t valid_uids;
 
 #ifdef HAVE_W32_SYSTEM
@@ -2470,7 +2531,7 @@ keyedit_quick_revuid (ctrl_t ctrl, const char *username, const char *uidtorev)
   if (err)
     goto leave;
 
-  /* Too make sure that we do not revoke the last valid UID, we first
+  /* To make sure that we do not revoke the last valid UID, we first
      count how many valid UIDs there are.  */
   valid_uids = 0;
   for (node = keyblock; node; node = node->next)
@@ -2479,40 +2540,35 @@ keyedit_quick_revuid (ctrl_t ctrl, const char *username, const char *uidtorev)
                    && !node->pkt->pkt.user_id->flags.expired);
 
   /* Find the right UID. */
-  revlen = strlen (uidtorev);
-  for (node = keyblock; node; node = node->next)
+  node = find_userid (keyblock, uidtorev);
+  if (node)
     {
-      if (node->pkt->pkttype == PKT_USER_ID
-          && revlen == node->pkt->pkt.user_id->len
-          && !memcmp (node->pkt->pkt.user_id->name, uidtorev, revlen))
-        {
-          struct revocation_reason_info *reason;
-
-          /* Make sure that we do not revoke the last valid UID.  */
-          if (valid_uids == 1
-              && ! node->pkt->pkt.user_id->flags.revoked
-              && ! node->pkt->pkt.user_id->flags.expired)
-            {
-              log_error (_("cannot revoke the last valid user ID.\n"));
-              err = gpg_error (GPG_ERR_INV_USER_ID);
-              goto leave;
-            }
+      struct revocation_reason_info *reason;
 
-          reason = get_default_uid_revocation_reason ();
-          err = core_revuid (ctrl, keyblock, node, reason, &modified);
-          release_revocation_reason_info (reason);
-          if (err)
-            goto leave;
-          err = keydb_update_keyblock (ctrl, kdbhd, keyblock);
-          if (err)
-            {
-              log_error (_("update failed: %s\n"), gpg_strerror (err));
-              goto leave;
-            }
+      /* Make sure that we do not revoke the last valid UID.  */
+      if (valid_uids == 1
+          && ! node->pkt->pkt.user_id->flags.revoked
+          && ! node->pkt->pkt.user_id->flags.expired)
+        {
+          log_error (_("cannot revoke the last valid user ID.\n"));
+          err = gpg_error (GPG_ERR_INV_USER_ID);
+          goto leave;
+        }
 
-          revalidation_mark (ctrl);
+      reason = get_default_uid_revocation_reason ();
+      err = core_revuid (ctrl, keyblock, node, reason, &modified);
+      release_revocation_reason_info (reason);
+      if (err)
+        goto leave;
+      err = keydb_update_keyblock (ctrl, kdbhd, keyblock);
+      if (err)
+        {
+          log_error (_("update failed: %s\n"), gpg_strerror (err));
           goto leave;
         }
+
+      revalidation_mark (ctrl);
+      goto leave;
     }
   err = gpg_error (GPG_ERR_NO_USER_ID);
 
@@ -4270,7 +4326,7 @@ menu_adduid (ctrl_t ctrl, kbnode_t pub_keyblock,
       if (uidstring)
         {
           write_status_error ("adduid", gpg_error (304));
-          log_error ("%s", _("Such a user ID already exists on this key!\n"));
+          log_error ("%s\n", _("Such a user ID already exists on this key!"));
         }
       return 0;
     }
diff --git a/g10/keygen.c b/g10/keygen.c
index 6106d98..945494a 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -568,7 +568,7 @@ keygen_set_std_prefs (const char *string,int personal)
 		    for (i=0; i<naead; i++)
 		      {
 			opt.personal_aead_prefs[i].type = PREFTYPE_AEAD;
-			opt.personal_aead_prefs[i].value = sym[i];
+			opt.personal_aead_prefs[i].value = aead[i];
 		      }
 
 		    opt.personal_aead_prefs[i].type = PREFTYPE_NONE;
diff --git a/g10/keyserver.c b/g10/keyserver.c
index f6d12e2..57c7538 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -1214,7 +1214,9 @@ keyserver_refresh (ctrl_t ctrl, strlist_t users)
 	      struct keyserver_spec *keyserver=desc[i].skipfncvalue;
 
               if (!opt.quiet)
-                log_info (_("refreshing %d key from %s\n"), 1, keyserver->uri);
+                log_info (ngettext("refreshing %d key from %s\n",
+                                   "refreshing %d keys from %s\n",
+                                   1), 1, keyserver->uri);
 
 	      /* We use the keyserver structure we parsed out before.
 		 Note that a preferred keyserver without a scheme://
diff --git a/g10/mainproc.c b/g10/mainproc.c
index cd62737..af11877 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -437,6 +437,11 @@ proc_symkey_enc (CTX c, PACKET *pkt)
                           && gpg_err_code (err) != GPG_ERR_CHECKSUM)
                         log_fatal ("process terminated to be bug compatible"
                                    " with GnuPG <= 2.2\n");
+                      else
+                        write_status_text (STATUS_ERROR,
+                                           "symkey_decrypt.maybe_error"
+                                           " 11_BAD_PASSPHRASE");
+
                       if (c->dek->s2k_cacheid[0])
                         {
                           if (opt.debug)
@@ -805,15 +810,22 @@ proc_encrypted (CTX c, PACKET *pkt)
     }
   else
     {
-      if ((gpg_err_code (result) == GPG_ERR_BAD_KEY
-	   || gpg_err_code (result) == GPG_ERR_CHECKSUM
-	   || gpg_err_code (result) == GPG_ERR_CIPHER_ALGO)
-          && c->dek && *c->dek->s2k_cacheid != '\0')
+      if (gpg_err_code (result) == GPG_ERR_BAD_KEY
+          || gpg_err_code (result) == GPG_ERR_CHECKSUM
+          || gpg_err_code (result) == GPG_ERR_CIPHER_ALGO)
         {
-          if (opt.debug)
-            log_debug ("cleared passphrase cached with ID: %s\n",
-                       c->dek->s2k_cacheid);
-          passphrase_clear_cache (c->dek->s2k_cacheid);
+          if (c->symkeys)
+            write_status_text (STATUS_ERROR,
+                               "symkey_decrypt.maybe_error"
+                               " 11_BAD_PASSPHRASE");
+
+          if (c->dek && *c->dek->s2k_cacheid != '\0')
+            {
+              if (opt.debug)
+                log_debug ("cleared passphrase cached with ID: %s\n",
+                           c->dek->s2k_cacheid);
+              passphrase_clear_cache (c->dek->s2k_cacheid);
+            }
         }
       glo_ctrl.lasterr = result;
       write_status (STATUS_DECRYPTION_FAILED);
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index bb05eab..cea1f7e 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -2351,8 +2351,10 @@ parse_signature (IOBUF inp, int pkttype, unsigned long pktlen,
 	}
       else
 	{
-	  sig->data[0] =
-	    gcry_mpi_set_opaque (NULL, read_rest (inp, pktlen), pktlen * 8);
+          void *tmpp;
+
+          tmpp = read_rest (inp, pktlen);
+	  sig->data[0] = gcry_mpi_set_opaque (NULL, tmpp, tmpp? pktlen * 8 : 0);
 	  pktlen = 0;
 	}
     }
@@ -2580,8 +2582,10 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
   if (!npkey)
     {
       /* Unknown algorithm - put data into an opaque MPI.  */
-      pk->pkey[0] = gcry_mpi_set_opaque (NULL,
-                                         read_rest (inp, pktlen), pktlen * 8);
+      void *tmpp = read_rest (inp, pktlen);
+      /* Current gcry_mpi_cmp does not handle a (NULL,n>0) nicely and
+       * thus we avoid to create such an MPI.  */
+      pk->pkey[0] = gcry_mpi_set_opaque (NULL, tmpp, tmpp? pktlen * 8 : 0);
       pktlen = 0;
       goto leave;
     }
@@ -2883,6 +2887,8 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
 	}
       else if (ski->is_protected)
 	{
+          void *tmpp;
+
 	  if (pktlen < 2) /* At least two bytes for the length.  */
 	    {
               err = gpg_error (GPG_ERR_INV_PACKET);
@@ -2893,9 +2899,10 @@ parse_key (IOBUF inp, int pkttype, unsigned long pktlen,
 	   * up to the end of the packet into the first SKEY
 	   * element.
            * FIXME: We can do better for v5 keys.  */
+
+          tmpp = read_rest (inp, pktlen);
 	  pk->pkey[npkey] = gcry_mpi_set_opaque (NULL,
-						 read_rest (inp, pktlen),
-						 pktlen * 8);
+						 tmpp, tmpp? pktlen * 8 : 0);
           /* Mark that MPI as protected - we need this information for
            * importing a key.  The OPAQUE flag can't be used because
            * we also store public EdDSA values in opaque MPIs.  */
diff --git a/g10/tdbio.c b/g10/tdbio.c
index a6ce5ce..50dccca 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -48,13 +48,6 @@
 #define MY_O_BINARY  0
 #endif
 
-/* We use ERRNO despite that the cegcc provided open/read/write
-   functions don't set ERRNO - at least show that ERRNO does not make
-   sense.  */
-#ifdef HAVE_W32CE_SYSTEM
-#undef strerror
-#define strerror(a) ("[errno not available]")
-#endif
 
 /*
  * Yes, this is a very simple implementation. We should really
@@ -730,13 +723,6 @@ tdbio_set_dbname (ctrl_t ctrl, const char *new_dbname,
       int rc;
       mode_t oldmask;
 
-#ifdef HAVE_W32CE_SYSTEM
-      /* We know how the cegcc implementation of access works ;-). */
-      if (GetLastError () == ERROR_FILE_NOT_FOUND)
-        gpg_err_set_errno (ENOENT);
-      else
-        gpg_err_set_errno (EIO);
-#endif /*HAVE_W32CE_SYSTEM*/
       if (errno && errno != ENOENT)
         log_fatal ( _("can't access '%s': %s\n"), fname, strerror (errno));
 
@@ -797,22 +783,6 @@ open_db ()
 
   log_assert( db_fd == -1 );
 
-#ifdef HAVE_W32CE_SYSTEM
-  {
-    DWORD prevrc = 0;
-    wchar_t *wname = utf8_to_wchar (db_name);
-    if (wname)
-      {
-        db_fd = (int)CreateFile (wname, GENERIC_READ|GENERIC_WRITE,
-                                 FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
-                                 OPEN_EXISTING, 0, NULL);
-        xfree (wname);
-      }
-    if (db_fd == -1)
-      log_fatal ("can't open '%s': %d, %d\n", db_name,
-                 (int)prevrc, (int)GetLastError ());
-  }
-#else /*!HAVE_W32CE_SYSTEM*/
   db_fd = gnupg_open (db_name, O_RDWR | MY_O_BINARY, 0);
   if (db_fd == -1 && (errno == EACCES
 #ifdef EROFS
@@ -827,7 +797,7 @@ open_db ()
   }
   if ( db_fd == -1 )
     log_fatal( _("can't open '%s': %s\n"), db_name, strerror(errno) );
-#endif /*!HAVE_W32CE_SYSTEM*/
+
   register_secured_file (db_name);
 
   /* Read the version record. */
diff --git a/g13/all-tests.scm b/g13/all-tests.scm
index 69b1f24..c96f092 100644
--- a/g13/all-tests.scm
+++ b/g13/all-tests.scm
@@ -26,10 +26,20 @@
  (define (parse filename key)
    (parse-makefile-expand filename expander key))
 
- (map (lambda (name)
-	(test::binary #f
-		      (path-join "g13" name)
-		      (path-join (getenv "objdir") "g13" name)))
-      (parse-makefile-expand (in-srcdir "g13" "Makefile.am")
-			     (lambda (filename port key) (parse-makefile port key))
-			     "module_tests")))
+ (define g13-enabled?
+   ;; Parse the variable "g13" in the Makefile
+   (not (null?
+         (parse-makefile-expand (in-objdir "Makefile")
+                                (lambda (filename port key) (parse-makefile port key))
+			        "g13"))))
+ (if g13-enabled?
+     (map (lambda (name)
+	    (test::binary #f
+		          (path-join "g13" name)
+		          (path-join (getenv "objdir") "g13" name)))
+          (parse-makefile-expand (in-srcdir "g13" "Makefile.am")
+			         (lambda (filename port key) (parse-makefile port key))
+			         "module_tests"))
+     (begin
+       (info "SKIP: g13")
+       '())))
diff --git a/g13/call-syshelp.c b/g13/call-syshelp.c
index a69573b..8850c37 100644
--- a/g13/call-syshelp.c
+++ b/g13/call-syshelp.c
@@ -102,11 +102,8 @@ start_syshelp (ctrl_t ctrl, assuan_context_t *r_ctx)
       return err;
     }
 
-  i = 0;
-  if (log_get_fd () != -1)
-    no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
-  no_close_list[i++] = assuan_fd_from_posix_fd (es_fileno (es_stderr));
-  no_close_list[i] = ASSUAN_INVALID_FD;
+  no_close_list[0] = assuan_fd_from_posix_fd (es_fileno (es_stderr));
+  no_close_list[1] = ASSUAN_INVALID_FD;
 
   err = assuan_new (&ctx);
   if (err)
diff --git a/kbx/backend-support.c b/kbx/backend-support.c
index 1821129..7ab6398 100644
--- a/kbx/backend-support.c
+++ b/kbx/backend-support.c
@@ -173,18 +173,18 @@ be_return_pubkey (ctrl_t ctrl, const void *buffer, size_t buflen,
   char hexubid[2*UBID_LEN+1];
 
   bin2hex (ubid, UBID_LEN, hexubid);
-  err = status_printf (ctrl, "PUBKEY_INFO", "%d %s %c%c %d %d",
-                       pubkey_type, hexubid,
-                       is_ephemeral? 'e':'-',
-                       is_revoked?   'r':'-',
-                       uid_no, pk_no);
+  err = kbxd_status_printf (ctrl, "PUBKEY_INFO", "%d %s %c%c %d %d",
+                            pubkey_type, hexubid,
+                            is_ephemeral? 'e':'-',
+                            is_revoked?   'r':'-',
+                            uid_no, pk_no);
   if (err)
     goto leave;
 
   if (ctrl->no_data_return)
     err = 0;
   else
-    err = kbxd_write_data_line(ctrl, buffer, buflen);
+    err = kbxd_write_data_line (ctrl, buffer, buflen);
 
  leave:
   return err;
diff --git a/kbx/kbxserver.c b/kbx/kbxserver.c
index fa04ccf..9908409 100644
--- a/kbx/kbxserver.c
+++ b/kbx/kbxserver.c
@@ -173,6 +173,23 @@ kbxd_writen (estream_t fp, const void *buffer, size_t length)
   return err;
 }
 
+/* This status functions expects a printf style format string.  */
+gpg_error_t
+kbxd_status_printf (ctrl_t ctrl, const char *keyword, const char *format, ...)
+{
+  gpg_error_t err;
+  va_list arg_ptr;
+  assuan_context_t ctx = get_assuan_ctx_from_ctrl (ctrl);
+
+  if (!ctx) /* Oops - no assuan context.  */
+    return gpg_error (GPG_ERR_NOT_PROCESSED);
+
+  va_start (arg_ptr, format);
+  err = vprint_assuan_status (ctx, keyword, format, arg_ptr);
+  va_end (arg_ptr);
+  return err;
+}
+
 
 /* A wrapper around assuan_send_data which makes debugging the output
  * in verbose mode easier.  It also takes CTRL as argument.  */
@@ -975,10 +992,6 @@ kbxd_start_command_handler (ctrl_t ctrl, gnupg_fd_t fd, unsigned int session_id)
   ctrl->server_local->next_session = session_list;
   session_list = ctrl->server_local;
 
-
-  /* The next call enable the use of status_printf.  */
-  set_assuan_context_func (get_assuan_ctx_from_ctrl);
-
   for (;;)
     {
       rc = assuan_accept (ctx);
@@ -1029,7 +1042,6 @@ kbxd_start_command_handler (ctrl_t ctrl, gnupg_fd_t fd, unsigned int session_id)
 
   assuan_close_output_fd (ctx);
 
-  set_assuan_context_func (NULL);
   ctrl->server_local->assuan_ctx = NULL;
   assuan_release (ctx);
 
diff --git a/kbx/keyboxd.c b/kbx/keyboxd.c
index 76e360b..88a350a 100644
--- a/kbx/keyboxd.c
+++ b/kbx/keyboxd.c
@@ -146,17 +146,12 @@ static struct debug_flags_s debug_flags [] =
 
 /* The timer tick used for housekeeping stuff.  Note that on Windows
  * we use a SetWaitableTimer seems to signal earlier than about 2
- * seconds.  Thus we use 4 seconds on all platforms except for
- * Windowsce.  CHECK_OWN_SOCKET_INTERVAL defines how often we check
+ * seconds.  Thus we use 4 seconds on all platforms.
+ * CHECK_OWN_SOCKET_INTERVAL defines how often we check
  * our own socket in standard socket mode.  If that value is 0 we
  * don't check at all.  All values are in seconds. */
-#if defined(HAVE_W32CE_SYSTEM)
-# define TIMERTICK_INTERVAL         (60)
-# define CHECK_OWN_SOCKET_INTERVAL   (0)  /* Never */
-#else
 # define TIMERTICK_INTERVAL          (4)
 # define CHECK_OWN_SOCKET_INTERVAL  (60)
-#endif
 
 /* The list of open file descriptors at startup.  Note that this list
  * has been allocated using the standard malloc.  */
@@ -1141,8 +1136,6 @@ create_server_socket (char *name, int cygwin, assuan_sock_nonce_t *nonce)
   len = SUN_LEN (unaddr);
   rc = assuan_sock_bind (fd, addr, len);
 
-  /* Our error code mapping on W32CE returns EEXIST thus we also test
-     for this. */
   if (rc == -1
       && (errno == EADDRINUSE
 #ifdef HAVE_W32_SYSTEM
@@ -1502,13 +1495,7 @@ handle_connections (gnupg_fd_t listen_fd)
   npth_sigev_add (SIGTERM);
   npth_sigev_fini ();
 #else
-# ifdef HAVE_W32CE_SYSTEM
-  /* Use a dummy event. */
-  sigs = 0;
-  ev = pth_event (PTH_EVENT_SIGS, &sigs, &signo);
-# else
   events[0] = INVALID_HANDLE_VALUE;
-# endif
 #endif
 
   if (disable_check_own_socket)
diff --git a/kbx/keyboxd.h b/kbx/keyboxd.h
index 3a80f9b..3fea6ad 100644
--- a/kbx/keyboxd.h
+++ b/kbx/keyboxd.h
@@ -171,6 +171,8 @@ void kbxd_sighup_action (void);
 
 
 /*-- kbxserver.c --*/
+gpg_error_t kbxd_status_printf (ctrl_t ctrl, const char *keyword,
+                                const char *format, ...);
 gpg_error_t kbxd_write_data_line (ctrl_t ctrl,
                                   const void *buffer_arg, size_t size);
 void kbxd_start_command_handler (ctrl_t, gnupg_fd_t, unsigned int);
diff --git a/po/ca.po b/po/ca.po
index 2cf307c..737b00a 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -36,7 +36,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
@@ -47,53 +47,53 @@ msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, fuzzy
 #| msgid "Do you really want to create a sign and encrypt key? "
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Segur que voleu crear una clau de signatura i xifratge? "
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "la contrasenya és invàlida"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -104,28 +104,28 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "la contrasenya és massa llarga\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -135,107 +135,107 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "la contrasenya és errònia"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "PIN too long"
 msgstr "la línia és massa llarga\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "la contrasenya és massa llarga\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad PIN"
 msgstr "l'MPI és erroni"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "la contrasenya és errònia"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/command.c:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -247,9 +247,9 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
@@ -257,15 +257,15 @@ msgstr "no s'ha pogut crear «%s»: %s\n"
 
 #: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -278,138 +278,129 @@ msgstr ""
 "no s'ha trobat cap anell secret de escrivible: %s\n"
 "\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2467
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Introduïu el nom d'usuari: "
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Repetiu la contrasenya: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Repetiu la contrasenya: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repetiu la contrasenya: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "error en la creació de la contrasenya: %s\n"
-
-#: agent/genkey.c:150
+#: agent/genkey.c:154
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "%s: error en escriure el registre de directoris: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduïu la contrasenya\n"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -417,7 +408,7 @@ msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "El nom ha de tenir, si més no, 5 caràcters\n"
 msgstr[1] "El nom ha de tenir, si més no, 5 caràcters\n"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -425,393 +416,392 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Voleu usar de tota manera aquesta clau?"
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "La clau ha estat substituïda"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "detall"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualitza la base de dades de confiança"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NOM|el joc de caràcters serà NOM"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
 # Gènere?  Nombre?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "no és suportat"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
 # Gènere?  Nombre?  ivb
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "no és suportat"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|usa el mode de contrasenya especificat"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "utilitza el gpg-agent"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AV�S: %s és una opció desaconsellada.\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, fuzzy, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, 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:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, 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:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, 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:2385
+#: agent/gpg-agent.c:2395
 #, 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:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, 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:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2832
+#: agent/gpg-agent.c:2842
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, 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:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claus es descarta\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
@@ -837,7 +827,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -847,7 +837,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -901,43 +891,43 @@ msgstr "Cancel·la"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "error de lectura: %s\n"
 
 # Parts?  Peces?  ivb
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "error de lectura: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -950,19 +940,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "sí|si"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -975,7 +965,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -985,48 +975,63 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "error en la lectura de «%s»: %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 #, fuzzy
 msgid "Change passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1231
+#, c-format
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1741
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 #, fuzzy
 msgid "Delete key"
 msgstr "activa una clau"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1048,7 +1053,7 @@ msgstr ""
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
@@ -1091,7 +1096,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -1155,12 +1160,12 @@ 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:905
+#: common/sysutils.c:880
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
@@ -1408,7 +1413,7 @@ msgstr "armadura: %s\n"
 # i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
 # encara no m'agraden massa... jm
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1584,7 +1589,7 @@ msgstr "no s'ha pogut crear l'armadura: %s\n"
 msgid "iconv_open failed: %s\n"
 msgstr "no es pot obrir el fitxer: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
@@ -1623,7 +1628,7 @@ msgstr "no s'ha trobat la clau pública %08lX: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1801,7 +1806,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
@@ -1844,7 +1849,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1875,7 +1880,7 @@ msgid "This command is only available for version 2 cards\n"
 msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 
 # Parts?  Peces?  ivb
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
@@ -1945,15 +1950,15 @@ msgstr "no hi ha cap clau pública corresponent: %s\n"
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
@@ -2300,27 +2305,27 @@ msgstr ""
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2385,8 +2390,8 @@ msgid "subkey"
 msgstr "Clau pública: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
@@ -2448,14 +2453,14 @@ msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2478,7 +2483,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AV�S: %s és una opció desaconsellada.\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2596,12 +2601,12 @@ msgstr "s'està escrivint la clau secreta a «%s»\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clau %08lX: clau d'estil PGP 2.x - es descarta\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "AV�S: no s'ha exportat res\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, fuzzy, c-format
 #| msgid "error creating `%s': %s\n"
@@ -2671,300 +2676,300 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
 # «de les claus» o «de la clau»?  ivb
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 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:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importa claus d'un servidor de claus"
 
 # «de les claus» o «de la clau»?  ivb
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "comprova les signatures de la claus"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "llista claus secretes"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2975,7 +2980,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:978
+#: g10/gpg.c:979
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -3005,13 +3010,13 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -3031,7 +3036,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:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -3039,577 +3044,577 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, fuzzy, c-format
 #| msgid "no = sign found in group definition `%s'\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AV�S: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "AV�S: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AV�S: el propietari és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AV�S: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "AV�S: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AV�S: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "AV�S: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "AV�S: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "AV�S: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "AV�S: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "AV�S: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "AV�S: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 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:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AV�S: el programa podria crear un fitxer core!\n"
 
 # FIXME: preferència? jm
 # Ho discutírem en la llista, segur.  Deu ser als arxius.  ivb
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AV�S: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, fuzzy, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, fuzzy, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "la mida de la clau és invàlida; s'hi usaran %u bits\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "no podeu usar l'algorisme de compressió %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AV�S: s'han donat destinataris (-r) sense usar xifratge de clau pública\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "la URL de política de certificació donada no és vàlida\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, 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"
@@ -3623,7 +3628,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informació d'estat en aquest FD"
 
@@ -4365,7 +4370,7 @@ msgstr "Segur que encara voleu signarla? (s/N) "
 # O no s'ha pogut? ivb
 # FIXME: comprovar context. jm
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  No es pot signar.\n"
 
@@ -4565,8 +4570,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
@@ -4793,7 +4798,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "La clau està revocada."
 
@@ -4846,7 +4851,7 @@ msgstr "Realment voleu eliminar aquest ID d'usuari? "
 msgid "Really move the primary key? (y/N) "
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
@@ -4934,173 +4939,173 @@ msgstr "Voleu desar els canvis? "
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualització.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "No podeu esborrar l'últim ID d'usuari!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Usuari inexistent.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "No hi ha res que signar amb la clau %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 #, fuzzy
 msgid "Notations: "
 msgstr "Notació: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hi ha preferències en un ID d'usuari d'estil PGP 2.x.\n"
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5108,19 +5113,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5130,19 +5135,19 @@ msgstr ""
 "      causar que una ID d'usuari diferent esdevinga en la primària "
 "assumida.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, 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:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5151,38 +5156,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
 # Aquesta i les següents no haurien de portar (s/N/q) i no (y/N/q)?  ivb
 # Hmm. Sí... (s/N/x) jm
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5190,37 +5195,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:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "invàlida"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5229,43 +5234,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:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AV�S: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5273,187 +5278,187 @@ msgid ""
 msgstr ""
 "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "S'està canviant la data de caducitat per a una clau primària.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "S'està canviant la data de caducitat per a una clau primària.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AV�S: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "es descarta l'autosignatura v3 en l'id d'usuari «%s»\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 "»\n"
 "signat amb la vostra clau %08lX el %s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Esteu segur de que encara voleu revocarla? (s/N) "
 
 # (s/N) ivb
 # S! jm
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta signatura? (s/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Heu signat els següents ID d'usuari:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AV�S: una signatura d'ID d'usuari està datada %d segons en el futur\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "No podeu esborrar l'últim ID d'usuari!\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5885,6 +5890,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "No inclogueu l'adreça ni en el camp *nom* ni en el camp *comentari*\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 # xX? ivb
 # Hmm... sí. jm
 #. TRANSLATORS: These are the allowed answers in
@@ -6225,55 +6234,55 @@ msgstr ""
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: no és un ID vàlid\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "s'està sol·licitant la clau %08lX de %s\n"
 msgstr[1] "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AV�S: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "es descarta «%s»: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AV�S: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
@@ -6306,259 +6315,259 @@ msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la clau pública és %08lX\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "xifrat amb una clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "xifrat amb %lu contrasenyes\n"
 
 # FIXME WK: Use ngettext
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "xifrat amb 1 contrasenya\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\n"
 
 # I no serà «dades xifrades amb %s»?  ivb
 # Sembla que sí, ho marque per a mirar-ho més endavant. jm
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "s'assumeixen dades xifrades amb %s\n"
 
 # L'optimístic és aquell que té una Fe Cega en que Tot Anirà Bé!  ivb
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "El xifratge IDEA no està disponible, s'intentarà utilitzar optimistament %s "
 "en el seu lloc\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AV�S: el missatge no tenia protecció d'integritat\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "desxifratge correcte\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AV�S: el missatge xifrat ha estat manipulat!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitent ha sol·licitat \"alt secret\"\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom del fitxer original='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signatura caducada de \""
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no es poden tractar aquestes signatures múltiples\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
 # «%.*s» no serà una data?  Caldrà «el» al davant.  ivb
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "La clau és disponible en: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[incert]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "AV�S: Aquesta clau no ve certificada per una signatura de confiança!\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "binari"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "desconeguda"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "l'algoritme de clau pública és desconegut"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "no és una signatura separada\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AV�S: s'han detectat múltiples signatures. Només es comprovarà la primera.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
@@ -6630,11 +6639,6 @@ msgstr ""
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "AV�S: %s és una opció desaconsellada.\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7750,137 +7754,137 @@ msgstr "error de lectura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dades de confiança: no s'ha pogut sincronitzar: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "reg de la base de dades de confiança %lu: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "reg de la base de dades de confiança %lu: ha fallat la escriptura (n=%d): "
 "%s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "la transacció de la base de dades de confiança és massa gran\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: el directori no existeix!\n"
 
 # No em passe! ;)  ivb
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: no s'ha pogut crear un registre de versió: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: s'ha creat una base de dades de confiança invàlida\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: s'ha creat la base de dades de confiança\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "NOTA: no es pot escriure en la base de dades de confiança\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: la base de dades de confiança és invàlida\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error en actualitzar el registre de la versió: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error en llegir el registre de la versió: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error en escriure el registre de la versió: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dades de confiança: ha fallat lseek: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s no és un fitxer de base de dades de confiança\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registre de versió amb número de registre %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: la versió de fitxer %d és invàlida\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error en llegir el registre lliure: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: no s'ha pogut posar a zero un registre: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: no s'ha pogut afegir un registre: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: s'ha creat la base de dades de confiança\n"
@@ -8518,16 +8522,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8562,10 +8566,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8585,158 +8589,158 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "genera un nou parell de claus"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "genera un nou parell de claus"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "elimina claus de l'anell públic"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "La generació de claus ha fallat: %s\n"
 msgstr[1] "La generació de claus ha fallat: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "canvia la contrasenya"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Nota: Aquesta clau ha estat desactivada.\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "canvia la contrasenya"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
@@ -8744,43 +8748,43 @@ msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8788,22 +8792,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8811,82 +8815,82 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
 # �dem.  ivb
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "l'URI no és suportada"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -8908,7 +8912,7 @@ msgstr "Introduïu el nom d'usuari: "
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8957,33 +8961,33 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "les ordres entren en conflicte\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
@@ -9222,7 +9226,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, fuzzy, c-format
 msgid "certificate chain too long\n"
 msgstr "Certificat de revocació vàlid"
@@ -9283,7 +9287,7 @@ msgstr ""
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -9341,42 +9345,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:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 #| msgid "bad certificate"
 msgid "looking for another certificate\n"
@@ -9573,6 +9577,11 @@ msgstr "Voleu crear un certificat de revocació per a aquesta clau? "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:433
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "error en la creació de la contrasenya: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9645,135 +9654,135 @@ msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "list external keys"
 msgstr "llista claus secretes"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "no usa el terminal en absolut"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea eixida amb armadura ascii"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "afegeix aquest anell a la llista"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOM|usa l'algoritme de xifratge NOM per a les contrasenyes"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|usa l'algoritme de xifratge NOM"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
 
 # Mode desatès (SC)  ivb
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "mode desatès: no pregunta mai"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "suposa «sí» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "suposa «no» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9784,28 +9793,28 @@ msgstr ""
 "signa, comprova, xifra o desxifra\n"
 "l'operació predeterminada depén de les dades introduïdes\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
 # No em passe! ;)  ivb
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9835,7 +9844,7 @@ msgstr "error en crear «%s»: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -9875,7 +9884,7 @@ msgstr "rev? hi ha problemes en la comprovació de la revocació: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -10243,12 +10252,6 @@ msgstr "no es pot crear el directori «%s»: %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/crlcache.c:948
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "error en la lectura de «%s»: %s\n"
-
 # No em passe! ;)  ivb
 #: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
@@ -10948,58 +10951,58 @@ msgstr ""
 msgid "usage: %s [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "la línia és massa llarga\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "error de lectura: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
@@ -11008,38 +11011,38 @@ msgstr ""
 # Probablement és una clau, femení. jm
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "no forçat"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "hi ha massa preferències «%c»\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11410,105 +11413,105 @@ msgstr "Certificat de revocació vàlid"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "ix"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "la línia és massa llarga\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
@@ -11574,12 +11577,12 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -11768,6 +11771,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "%s: error en escriure el registre de directoris: %s\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "La clau ha estat substituïda"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "El nom no pot començar amb un dígit\n"
 
@@ -12031,10 +12043,6 @@ msgstr ""
 #~ msgstr "no s'ha pogut obrir %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "error en la lectura de «%s»: %s\n"
 
diff --git a/po/cs.gmo b/po/cs.gmo
index 5ef8b1a..98640c0 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 2794e1c..464fcd4 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg2 2.2.22\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2020-08-31 18:53+02:00\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <gnupg-i18n@gnupg.org>\n"
@@ -48,7 +48,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "získání zámku pinetry se nezdařilo: %s\n"
@@ -59,49 +59,49 @@ msgstr "získání zámku pinetry se nezdařilo: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Zrušit"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Ano"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_Ne"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Uložit do správce hesel"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Opravdu chcete u�init heslo na obrazovce viditelným?"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Zviditelnit heslo"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Skrýt heslo"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -112,7 +112,7 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -123,14 +123,14 @@ msgstr ""
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -138,7 +138,7 @@ msgstr "Heslo je příliš dlouhé"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Kvalita:"
 
@@ -148,96 +148,96 @@ msgstr "Kvalita:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Kvalita textu zde zadaného.\n"
 "Na podrobnosti ohledně kritérií se zeptejte svého správce."
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 "Prosím, zadejte váš PIN, aby pro tuto relaci mohl být odemknut tajný klí�"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 "Prosím, zadejte vaše heslo, aby pro tuto relaci mohl být odemknut tajný klí�"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Heslo:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "neshodují se – zkuste to znovu"
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (pokus %d z %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr "Znovu:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 msgid "PIN too long"
 msgstr "PIN je příliš dlouhý"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 msgid "Passphrase too long"
 msgstr "Heslo je příliš dlouhé"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 msgid "Invalid characters in PIN"
 msgstr "Neplatný znak v PINu"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr "PIN je příliš krátký"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad PIN"
 msgstr "Špatný PIN"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad Passphrase"
 msgstr "Špatné heslo"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Prosím, vložte toto heslo znovu"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -249,7 +249,7 @@ msgstr ""
 "Prosím, zadejte heslo, abyste ochránili importovaný objekt uvnitř systému "
 "GnuPG."
 
-#: agent/command.c:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -261,24 +261,24 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "SSH klí�e delší než %d bitů nejsou podporovány\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, 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
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "nelze otevřít „%s“: %s\n"
@@ -288,12 +288,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:2513
+#: agent/command-ssh.c:2467
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "chyba při získávání seznamu karet: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
@@ -302,20 +302,20 @@ msgstr ""
 "Proces SSH si vyžádal použití klí�e%%0A  %s%%0A  (%s)%%0APřejete si to "
 "povolit?"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Povolit"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Zakázat"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Prosím, vložte heslo pro SSH klí�%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -324,87 +324,79 @@ msgstr ""
 "Prosím, vložte heslo, abyste ochránil(a) přijatý tajný klí�%%0A   %s%%0A   %s"
 "%%0Auvnitř úložiště klí�ů gpg-agenta"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "ze socketu se nepodařilo se vytvořit proud (stream): %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Prosím, vložte kartu se sériovým �íslem"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "PIN správce"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Reseta�ní kód"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr "Potvr�te tla�ítkem na kartě nebo bezpe�nostním zařízení."
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr "Pro vstup použijte klávesnici �te�ky."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Zopakujte reseta�ní kód"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Zopakujte tento PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Zopakujte tento PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Reseta�ní kód nebyl správně zopakován; zkuste to znovu"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK nebyl zopakován správně; zkuste to znovu"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN nebyl zopakován správně; zkuste to znovu"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Prosím, vložte PIN%s%s%s, abyste odemkli kartu"
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "chyba při vytváření do�asného souboru: %s\n"
-
-#: agent/genkey.c:150
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "chyba při zápisu do do�asného souboru: %s\n"
+#: agent/genkey.c:154
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "chyba při zápisu do %s: %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 msgid "Enter new passphrase"
 msgstr "Vložte nové heslo"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "Nezadali jste heslo!%0APrázdné heslo není dovoleno."
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -413,11 +405,11 @@ msgstr ""
 "Nezadali jste heslo – toto je obecně špatný nápad!%0AProsím, potvr�te, že si "
 "žádnou ochranu svého klí�e nepřejete."
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr "Ano, ochrana není třeba"
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
@@ -425,7 +417,7 @@ msgstr[0] "Heslo by mělo být dlouhé alespoň %u znak."
 msgstr[1] "Heslo by mělo být dlouhé alespoň %u znaky."
 msgstr[2] "Heslo by mělo být dlouhé alespoň %u znaků."
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -435,242 +427,238 @@ msgstr[1] "Heslo by mělo obsahovat alespoň %u �íslice nebo %%0Azvláštní z
 msgstr[2] ""
 "Heslo by mělo obsahovat alespoň %u �íslic nebo %%0Azvláštních znaků."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Heslo by nemělo být známým slovem nebo se shodovat%%0As ur�itým vzorem."
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Varování: Zadali jste nebezpe�né heslo."
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 msgid "Take this one anyway"
 msgstr "Použít přesto tento klí�"
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Pro ochranu svého nového klí�e,%0Aprosím, zadejte heslo"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 msgid "Please enter the new passphrase"
 msgstr "Prosím, zadejte nové heslo"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Volby užite�né při ladění"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr "poběží v režimu démona (na pozadí)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr "poběží v režimu serveru (na popředí)"
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-msgid "run in supervised mode"
-msgstr "poběží v režimu dohledu"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr "neodpojovat se od konzole"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr "vypisovat příkazy ve stylu sh"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr "vypisovat příkazy ve stylu csh"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 msgid "|FILE|read options from FILE"
 msgstr "|SOUBOR|na�íst volby ze SOUBORU"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr "Volby ovlivňující diagnostický výstup"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "upovídaný režim"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "být o trochu víc tichý"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|SOUBOR|protokol z režimu serveru se zapíše do SOUBORU"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr "Volby ovlivňující nastavení"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "nepoužívat SCdémona"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PROGRAM|použít PROGRAM jako SCdaemon program"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PROGRAM|použít PROGRAM jako SCdaemon program"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|N�ZEV|přijímat některé příkazy přes N�ZEV"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignorovat požadavky na změnu TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignorovat požadavky na změnu X displeje"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "zapnout podporu pro OpenSSH"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGORITMUS|ukazovat otisky SSH pomocí ALGORITMU"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "zapnout podporu pro PuTTY"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 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:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|zahodit zapamatované PINy po N sekundách"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|zahazovat klí�e SSH po N sekundách"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|nastavit maximální životnost do�asné paměti pro PINy na N sekund"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N| nastavit maximální životnost klí�ů SSH na N sekund"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr "nepoužívat paměť PINů na podepisování"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 msgid "disallow the use of an external password cache"
 msgstr "nedovolit použít vnější úložiště na hesla"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "nedovolit klientům ozna�ovat klí�e za „důvěryhodné“"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 msgid "allow presetting passphrase"
 msgstr "umožnit přednastavení hesla"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr "Volby vynucující politiku hesel"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr "nedovolit obejití politiky hesel"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|nastavit minimální vyžadovanou délku nových hesel na N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|vyžaduje alespoň N nepísmenných znaků v novém hesle"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|SOUBOR|prověřovat nová hesla proti vzorům v SOUBORU"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|omezit platnost hesla na N dnů"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 msgid "do not allow the reuse of old passphrases"
 msgstr "nedovolit opakovat stará hesla"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Volby ovlivňující bezpe�nost"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr "znemožnit volajícímu přebít pinentry"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "neuzurpovat si klávesnici a myš"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PROGRAM|použít PROGRAM jako PIN-Entry program"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|nastavit �asový limit pro Pinentry na N sekund"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "umožnit zadání hesla skrze Emacs"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Chyby v programu, prosím, oznamujte (anglicky) na <@EMAIL@>,\n"
 "připomínky k překladu hlaste na <gnupg-i18n@gnupg.org>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Použití: @GPG_AGENT@ [volby] (-h pro nápovědu)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -678,131 +666,136 @@ msgstr ""
 "Syntaxe: @GPG_AGENT@ [volby] [příkaz [argumenty]]\n"
 "Správa tajných klí�ů pro @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "zadána neplatná úroveň ladění „%s“\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "�tou se možnosti z „%s“\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "VAROV�N�: používání parametru „%s“ se nedoporu�uje\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "socket nelze vytvořit: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "název socketu „%s“ je příliš dlouhý\n"
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, 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:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, 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:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, 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:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "naslouchá se na socketu „%s“\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "nelze vytvořit adresář „%s“: %s\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "adresář „%s“ vytvořen\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "volání stat() na „%s“ selhalo: %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "„%s“ nelze použít jako domovský adresář\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, 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:2747
+#: agent/gpg-agent.c:2757
 #, 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:2752
+#: agent/gpg-agent.c:2762
 #, 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:2827
+#: agent/gpg-agent.c:2837
 #, 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:2832
+#: agent/gpg-agent.c:2842
 #, 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:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect selhala: %s – �eká se 1 s\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s pozastaveno\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "v této relaci neběží žádný gpg-agent\n"
@@ -827,7 +820,7 @@ msgstr ""
 "Syntaxe: gpg-preset-passphrase [volby] KEYGRIP\n"
 "Správa do�asné paměti pro hesla\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -837,7 +830,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -893,42 +886,42 @@ msgstr "zrušeno\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba při ptaní se na heslo: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "chyba při otevírání „%s“: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "soubor „%s“, řádek %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "ignorováno sdělení „%s“ z „%s“, řádku %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "systémový důvěryhodný seznam „%s“ není dostupný\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "chybný otisk v „%s“, řádek %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "neplatný příznak klí�e v „%s“, řádek %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "chyba při �tení „%s“, řádek %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "chyba při �tení seznamu důvěryhodných kořenových certifikátů\n"
@@ -941,7 +934,7 @@ msgstr "chyba při �tení seznamu důvěryhodných kořenových certifikátů\n
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -950,11 +943,11 @@ msgstr ""
 "Věříte bezmezně, že%%0A  „%s“%%0Ařádně ověřuje identitu uživatele při "
 "vydávání certifikátu?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 msgid "Yes"
 msgstr "Ano"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr "Ne"
@@ -967,7 +960,7 @@ msgstr "Ne"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -978,35 +971,54 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr "V pořádku"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr "Å patnÄ›"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "chyba při přejmenování „%s“ na „%s“: %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Poznámka: Toto heslo nikdy nebylo změněno.%0AProsím, nyní jej změňte."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr "Toto heslo se nezměnilo%%0Aod %.4s-%.2s-%.2s. Prosím, nyní jej změňte."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 msgid "Change passphrase"
 msgstr "Změnit heslo"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr "Změním jej později"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+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?"
+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?"
+
+#: agent/findkey.c:1741
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -1014,11 +1026,11 @@ msgid ""
 msgstr ""
 "Opravdu chcete smazat klí� ur�ený pomocí keygripu%%0A  %s%%0A  %%C%%0A?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 msgid "Delete key"
 msgstr "Smazat klí�"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1042,7 +1054,7 @@ msgstr "%s klí� používá nebezpe�ný (%ubitový) hash\n"
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%zubitový hash není platný pro %ubitový %s klí�\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvořeného podpisu se nepodařila: %s\n"
@@ -1081,7 +1093,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba při rozdvojování procesu: %s\n"
@@ -1144,12 +1156,12 @@ 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:905
+#: common/sysutils.c:880
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "�ekání, až se soubor „%s“ stane přístupným…\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "přejmenování „%s“ na „%s“ se nezdařilo: %s\n"
@@ -1370,7 +1382,7 @@ msgid "algorithm: %s"
 msgstr "algoritmus: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "nepodporovaný algoritmus: %s"
@@ -1525,7 +1537,7 @@ msgstr "převod z „%s“ na „%s“ není k dispozici\n"
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open selhala: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "převod z „%s“ na „%s“ se nezdařil: %s\n"
@@ -1565,7 +1577,7 @@ msgid "waiting for lock %s...\n"
 msgstr "�ekám na zámek %s…\n"
 
 # První argument je název knihovny
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s je příliš stará (potřeba %s, přítomna %s)\n"
@@ -1735,7 +1747,7 @@ msgstr "chyba při �tení z %s': %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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "v této relaci neběží žádný dirmngr\n"
@@ -1774,7 +1786,7 @@ 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:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, c-format
 msgid "Note: %s\n"
 msgstr "Poznámka: %s\n"
@@ -1801,7 +1813,7 @@ msgstr "nelze provést v dávkovém režimu\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Tento příkaz je dostupný pouze pro karty verze 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Reseta�ní kód není nebo už není dostupný\n"
@@ -1866,14 +1878,14 @@ msgstr "URL pro získání veřejného klí�e: "
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "chyba při �tení „%s“: %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
@@ -2212,26 +2224,26 @@ msgstr "příkazy správce nejsou povoleny\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatný příkaz (zkuste „help“)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento příkaz není platný\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "„%s“ nelze otevřít\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klí� „%s“ nenalezen: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2295,8 +2307,8 @@ msgid "subkey"
 msgstr "podklí�e"
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
@@ -2359,14 +2371,14 @@ msgstr "šifrovací algoritmus „%s“ se nesmí používat v režimu %s\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "šifrovací algoritmus „%s“ se nesmí používat v režimu %s\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2388,7 +2400,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "VAROV�N�: klí� %s není vhodný pro šifrování v režimu %s\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2491,12 +2503,12 @@ msgstr "exportování tajného klí�e není povoleno\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "klí� %s: PGP 2.x klí� – přesko�eno\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "VAROV�N�: nebylo nic vyexportováno\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, c-format
 msgid "error creating '%s': %s\n"
@@ -2561,280 +2573,280 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "platné hodnoty pro volbu „%s“:\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 msgid "make a signature"
 msgstr "vytvořit podpis"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "make a clear text signature"
 msgstr "vytvořit podpis v �itelném dokumentu"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "vytvořit podpis oddělený od dokumentu"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "Å¡ifrovat data"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "šifrování pouze se symetrickou šifrou"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "dešifrovat data (implicitně)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "vypsat seznam klí�ů"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "vypsat seznam klí�ů a podpisů"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy klí�ů"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam klí�ů a otisků"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "vypsat seznam tajných klí�ů"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "vytvořit nový pár klí�ů"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 msgid "quickly generate a new key pair"
 msgstr "rychle vytvořit nový pár klí�ů"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "quickly add a new user-id"
 msgstr "rychle přidat novou identitu uživatele"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 msgid "quickly revoke a user-id"
 msgstr "rychle odvolat identitu uživatele"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly set a new expiration date"
 msgstr "rychle nastavit nové datum konce platnosti"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr "komplexní vytvoření páru klí�ů"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "vytvořit revoka�ní certifikát"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "odstranit klí� ze souboru veřejných klí�ů"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "odstranit klí� ze souboru tajných klí�ů"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "quickly sign a key"
 msgstr "rychle podepsat klí�"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "quickly sign a key locally"
 msgstr "rychle lokálně podepsat klí�"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "quickly revoke a user-id"
 msgid "quickly revoke a key signature"
 msgstr "rychle odvolat identitu uživatele"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "podepsat klí�"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "podepsat klí� lokálně"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat klí�"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "změnit heslo"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "exportovat klí�e"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "exportovat klí�e na server klí�ů"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "importovat klí�e ze serveru klí�ů"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "vyhledat klí�e na serveru klí�ů"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat všechny klí�e ze serveru klí�ů"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "importovat/slou�it klí�e"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr "vytisknout stav karty"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr "změnit data na kartě"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr "změnit PIN karty"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "aktualizovat databázi důvěry"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid "print message digests"
 msgstr "vypsat hash zprávy"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "pracovat v režimu serveru"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|HODNOTA|nastavit TOFU politiku klí�i"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|N�ZEV|použít N�ZEV jako implicitní tajný klí�"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 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:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|nastavit e-mailový alias"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr "použít chování striktně podle OpenPGP"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "neprovádět žádné změny"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "vyžádat potvrzení před přepsáním"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Volby ovlivňující bezpe�nost"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Volby ovlivňující diagnostický výstup"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "vytvořit výstup zapsaný v ASCII"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|SOUBOR|zapsat výstup do SOUBORU"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "použít kanonický textový režim"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nastavit úroveň komprese na N (0 – žádná)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
 msgstr "Volby ovlivňující interaktivitu a vymáhání"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|METODA|používat METODU pro dohledávání klí�ů podle e-mailové adresy"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 msgid "import missing key from a signature"
 msgstr "importovat chybějící klí� z podpisu"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 msgid "include the public key in signatures"
 msgstr "zahrnovat veřejný klí� do podpisů"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "zakázat veškerý přístup k dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "Volby ovlivňující nastavení"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "vypsat seznam tajných klí�ů"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|ID_UŽIVATELE|šifrovat pro ID_UŽIVATELE"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|ID_UŽIVATELE|použít toto ID_UŽIVATELE pro podepsání nebo dešifrování"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2842,7 +2854,7 @@ msgstr ""
 "@\n"
 "(Pro úplný seznam všech příkazů a voleb nahlédněte do manuálové stránky.)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2862,11 +2874,11 @@ msgstr ""
 " --list-keys [jména]        ukázat klí�e\n"
 " --fingerprint [jména]      ukázat otisky\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Použití: @GPG@ [možnosti] [soubory] (-h pro nápovědu)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2876,7 +2888,7 @@ msgstr ""
 "Podepisuje, ověřuje, šifruje nebo dešifruje.\n"
 "Výchozí operace závisí na vstupních datech.\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2884,79 +2896,79 @@ msgstr ""
 "\n"
 "Podporované algoritmy:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Veřejný klí�: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Å ifra: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 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:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "konfliktní příkazy\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = podpis nalezen v definici skupiny „%s“\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictví domovského adresáře „%s“ není nastaveno bezpe�ně\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictví konfigura�ního souboru „%s“ není nastaveno bezpe�ně\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictví rozšiřujícího modulu „%s“ není nastaveno bezpe�ně\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "VAROV�N�: přístupová práva pro domovský adresář „%s“ nejsou bezpe�ná\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 "VAROV�N�: přístupová práva pro konfigura�ní soubor „%s“ nejsou bezpe�ná\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "VAROV�N�: přístupová práva rozšiřujícímu modulu „%s“ nejsou bezpe�ná\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictví adresáře s domovským adresářem „%s“ není nastaveno "
 "nebezpe�ně\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2964,21 +2976,21 @@ msgstr ""
 "VAROV�N�: vlastnictví adresáře „%s“ s konfigura�ním souborem není nastaveno "
 "nebezpe�ně\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictví adresáře „%s“ s rozšiřujícím modulem není nastaveno "
 "nebezpe�ně\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "VAROV�N�: přístupová práva k adresáři „%s“ s domovským adresářem nejsou "
 "nastavena bezpe�ně\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2986,7 +2998,7 @@ msgstr ""
 "VAROV�N�: přístupová práva k adresáři „%s“ s konfigura�ním souborem nejsou "
 "nastavena bezpe�ně\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
@@ -2994,470 +3006,470 @@ msgstr ""
 "nastavena bezpe�ně\n"
 
 # c-format
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "neznámá konfigura�ní položka „%s“\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr "zobrazovat ID fotografií během výpisu klí�ů"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 msgid "show key usage information during key listings"
 msgstr "ukazovat údaje o ú�elu klí�e při výpisu klí�ů"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr "ukazovat URL politik během výpisu podpisů"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 msgid "show all notations during signature listings"
 msgstr "ukazovat všechny poznámky během výpisu podpisů"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr "ukazovat poznámky IETF standardu během vypisování podpisů"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr "ukazovat uživatelské poznámky během výpisu podpisů"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "ukazovat URL upřednostňovaného serveru klí�ů při výpisu podpisů"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr "ukazovat platnost ID uživatelů při výpisu klí�ů"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr "ukazovat odvolané a prošlé ID uživatelů při výpisu klí�ů"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr "ukazovat odvolané a prošlé podklí�e při výpisu klí�ů"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 msgid "show the keyring name in key listings"
 msgstr "ukazovat název souboru s klí�i při výpisu klí�ů"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 msgid "show expiration dates during signature listings"
 msgstr "ukazovat data expirace během výpisu podpisů"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "neznámá TOFU politika „%s“\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(možnosti lze vypsat příkazem „help“)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento příkaz není v režimu %s dovolen.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Poznámka: %s není pro normální použití!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "„%s“ není platná doba expirace podpisu\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "„%s“ není správná e-mailová adresa\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "neplatný režim pinentry „%s“\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "neplatný původ požadavku „%s“\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "„%s“ není platná znaková sada\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru klí�ů\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatný parametr pro server klí�ů\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "neplatný parametr pro server klí�ů\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatný parametr pro import\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "neplatný parametr pro import\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "neplatná volba filtru: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatný parametr pro export\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "neplatný parametr pro export\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatný parametr pro výpis\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr "neplatný parametr pro výpis\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr "zobrazovat ID fotografií při ověřování podpisu"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr "ukazovat URL politik při ověřování podpisu"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 msgid "show all notations during signature verification"
 msgstr "ukazovat všechny poznámky při ověřování podpisu"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "ukazovat URL upřednostňovaného serveru klí�ů při ověřování podpisu"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 msgid "show user ID validity during signature verification"
 msgstr "ukazovat platnost ID uživatele při ověřování podpisu"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "ukazovat odvolané a prošlé ID uživatelů při ověřování podpisů"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 msgid "show only the primary user ID in signature verification"
 msgstr "ukazovat jen primární ID uživatele při ověřování podpisu"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatný parametr pro ověření\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr "neplatný parametr pro ověření\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatný seznam auto-key-locate\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "neplatný seznam auto-key-locate\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "neplatný argument u volby „%.50s“\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program může vytvořit soubor core!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s přepíše %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Není dovoleno používat %s s %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedává s %s smysl!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "VAROV�N�: pracuji s podvrženým systémovým �asem: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nelze spustit s nebezpe�nou pamětí vzhledem k %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybraný kompresní algoritmus je neplatný\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "položka completes-needed musí být větší než 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "položka marginals-needed musí být větší než 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "položka max-cert-depth musí být v rozmezí od 1 do 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "neplatná implicitní úroveň certifikace (default-cert-level); musí být 0, 1, "
 "2 nebo 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "neplatná minimální úroveň certifikace (min-cert-level); musí být 0, 1, 2 "
 "nebo 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Poznámka: jednoduchý režim S2K (0) je důrazně nedoporu�ován\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatný režim S2K; musí být 0, 1 nebo 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "neplatné implicitní předvolby\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatné uživatelské předvolby pro šifrování\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "neplatné uživatelské předvolby pro šifrování\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "neplatné uživatelské předvolby pro hashování\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "neplatné uživatelské předvolby pro komprimaci\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "neplatná délka klí�e; použiji %u bitů\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud není funk�ní s %s\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 #| msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "šifrovací algoritmus „%s“ se nesmí používat v režimu %s\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "kompresní algoritmus „%s“ se nesmí používat v režimu %s\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat databázi důvěry: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROV�N�: specifikován adresát (-r) bez použití šifrování s veřejným klí�em\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symetrické šifrování „%s“ se nepovedlo: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nelze použít --symmetric --encrypt s příkazem --s2k-mode 0\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "nelze použít --symmetric --encrypt v režimu %s\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nelze použít --symmetric --sign --encrypt s příkazem --s2k-mode 0\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "nelze použít --symmetric --sign --encrypt v režimu %s\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odeslání na keyserver se nezdařilo: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "získání dat z serveru klí�ů se nezdařilo: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export klí�e se nepodařil: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export jako SSH klí� se nepodařil: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hledání na serveru klí�ů se nezdařilo: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "obnovení dat na serveru klí�ů se nezdařilo: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódování z ASCII formátu selhalo: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódování do ASCII formátu selhalo: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "neplatný hashovací algoritmus „%s“\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "chyba při rozboru názvu klí�e „%s“: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "„%s“ nevypadá jako platné ID klí�e, otisk klí�e nebo keygrip\n"
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "POZOR: nezadán žádný příkaz. Váš záměr bude odhadnut…\n"
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�něte psát svou zprávu…\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadané URL pro certifika�ní politiku je neplatné\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadané URL pro podepisovací politiku je neplatné\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadané URL preferovaného serveru klí�ů je neplatné\n"
@@ -3470,7 +3482,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
@@ -4199,7 +4211,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Jste si jistý(á), že stále chcete podepsat tento klí�? (a/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
@@ -4374,8 +4386,8 @@ msgstr "Velmi pe�livě jsem ověřil tento klí�.\n"
 msgid "Really sign? (y/N) "
 msgstr "Skute�ně podepsat? (a/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podepsání selhalo: %s\n"
@@ -4571,7 +4583,7 @@ 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:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "Klí� je odvolán."
 
@@ -4619,7 +4631,7 @@ msgstr "Opravdu odstranit tento id uživatele? (a/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Opravdu přesunout primární klí�? (a/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr "Musíte vybrat právě jeden klí�.\n"
 
@@ -4695,162 +4707,162 @@ msgstr "Uložit změny? (a/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�it bez uložení? (a/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Klí� nebyl změněn, takže není potřeba jej aktualizovat.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "poslední platné ID uživatele nelze odvolat.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "odvolání ID uživatele se nepodařilo: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "nastavení primárního ID uživatele se nepodařilo: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "„%s“ není otisk\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "„%s“ není primární otisk\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Neplatné ID uživatele „%s“: %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "No matching user IDs."
 msgstr "Žádný identifikátor uživatele neodpovídá."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "Nothing to sign.\n"
 msgstr "Nic na podepsání.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Nepodepsáno vámi.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "kontrola vytvořeného podpisu se nepodařila: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "„%s“ není platná doba expirace\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "„%s“ není řádný otisk\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "podklí� „%s“ nenalezen\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr "AEAD: "
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr "Keyserver bez modifikace"
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr "Preferovaný keyserver: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 msgid "Notations: "
 msgstr "Poznámky: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Uživatelský ID formátu PGP 2.x nemá žádné předvolby\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "V %s byl následující klí� odvolán %s klí�em %s\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento klí� může být odvolán %s klí�em %s "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr "(citlivá informace)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "vytvořen: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr "odvolán: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skon�ila: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skon�í: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr "použití: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr "�íslo karty: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr "důvěra: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Tento klí� byl ozna�en za neplatný (disabled)"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4859,17 +4871,17 @@ msgstr ""
 "být nutně správné, dokud znova nespustíte program.\n"
 
 # status
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr "odvolán"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "platnost skon�ila"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4878,17 +4890,17 @@ msgstr ""
 "VAROV�N�: žádné uživatelské ID nebylo ozna�eno jako primární.  Tento příkaz\n"
 "              může způsobit, že za primární bude považováno jiné user ID.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "POZOR: Vašemu šifrovacímu podklí�i brzy vyprší platnost.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Dobu platnosti také můžete změnit.\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4897,35 +4909,37 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 klí�. Přidání fotografického ID může v některých\n"
 "         verzích PGP vést k odmítnutí tohoto klí�e.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Jste si jistý, že jej chcete stále přidat? (a/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Neměli by jste přidávat fotografický ID k PGP2 klí�i.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "Takový identifikátor uživatele již u tohoto klí�e existuje!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobrý podpis? (a/N/u)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatný podpis? (a/N/u)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento neznámý podpis? (a/N/u)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4933,20 +4947,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:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smazáno.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "neplatný"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uživatelské ID „%s“ směstnáno: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4954,17 +4968,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:4467
+#: g10/keyedit.c:4523
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uživatelské ID „%s“: je již minimalizované\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uživatelské ID „%s“: je již odstraněné\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4973,210 +4987,210 @@ msgstr ""
 "VAROV�N�: Toto je PGP2 klí�. Přidání pověřeného odvolatele může v některých\n"
 "          verzích PGP vést k odmítnutí tohoto klí�e.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "K PGP2 klí�i byste neměli přidávat pověřeného odvolatele.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vložte identifikátor pověřeného odvolatele: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "klí� formátu PGP 2.x nelze pověřit odvoláním\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "klí� nelze pověřit odvoláním sama sebe\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento klí� již byl ur�en jako odvolatel\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "VAROV�N�: ustanovení klí�e pověřeným odvolatelem je nevratná operace!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Jste si jistí, že tento klí� chcete pověřit odvoláním? (a/N) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "Jste si jistí, že chcete změnit dobu expirace více podklí�ům? (a/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Měním dobu expirace podklí�e.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Měním dobu expirace primárního klí�e.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nemůžete změnit dobu platnosti klí�e verze 3\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 msgid "Changing usage of a subkey.\n"
 msgstr "Mění se ú�el podklí�e.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 msgid "Changing usage of the primary key.\n"
 msgstr "Mění se ú�el primárního klí�e.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "podepisovací podklí� %s je již křížově certifikován\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "podklí� %s nepodepisuje, a tak není třeba jej křížově certifikovat\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosím, vyberte právě jeden id uživatele .\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "přesko�en v3 podpis klí�e jím samým u uživatelského id „%s“\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vložte URL preferovaného serveru klí�ů: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Jste si jistý(á), že jej chcete přepsat? (a/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jistý(á), že jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 msgid "Enter the notation: "
 msgstr "Vložte poznámku: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 msgid "Proceed? (y/N) "
 msgstr "Pokra�ovat (a/N)? "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifikátor uživatele s indexem %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje uživatelské ID s hashem %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Neexistuje podklí� s ID klí�e „%s“.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podklí� s indexem %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID uživatele: „%s“\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podepsáno vaším klí�em %s v %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (neexportovatelné)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vyprší %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Jste si jisti, že jej chcete stále odvolat? (a/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvořit pro tento podpis odvolací certifikát? (a/N)"
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podepsal(a) jste následující identifikátory uživatele: %s:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr " (neodvolatelné)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "odvoláno vaším klí�em %s v %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chystáte se odvolat tyto podpisy:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvořit odvolací certifikáty? (a/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "neexistuje tajný klí�\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "pokus odvolat ID neuživatele: %s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "uživatelské ID „%s“ je již odvoláno\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROV�N�: podpis ID uživatele je datován %d sekund v budoucnosti\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Poslední platné ID uživatele nelze odvolat.\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klí� %s je již odvolán.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklí� %s je již odvolán.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, 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"
@@ -5605,6 +5619,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do pole jméno nebo komentář nepište, prosím, e-mailovou adresu.\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Takový identifikátor uživatele již u tohoto klí�e existuje!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5931,7 +5949,7 @@ msgstr "neplatný protokol serveru klí�ů (naše %d!=obsluha %d)\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "„%s“ není ID klí�e: přesko�eno\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5939,47 +5957,47 @@ msgstr[0] "aktualizuje se %d klí� z %s\n"
 msgstr[1] "aktualizují se %d klí�e z %s\n"
 msgstr[2] "aktualizuje se %d klí�ů z %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat klí� %s prostřednictvím %s: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "klí� „%s“ nebyl na serveru klí�ů nalezen\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "klí� nebyl na serveru klí�ů nalezen\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "požaduji klí� %s z %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "není znám žádný server s klí�i\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "přesko�en „%s“: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "posílám klí� %s na %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "požaduje se klí� z „%s“\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROV�N�: URI %s nelze získat: %s\n"
@@ -6012,72 +6030,72 @@ msgstr "zašifrováno neznámým algoritmem %d\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "heslo (passphrase) generováno s použitím neznámého algoritmu %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr "veřejný klí� je %s\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "zašifrována %u-bitovým %s klí�em, ID %s, vytvořeným %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      „%s“\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zašifrováno %s klí�em, ID %s\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "VAROV�N�: zachyceno více prostých textů\n"
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zašifrováno s heslem %lu\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "zašifrováno jedním heslem\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dešifrování veřejným klí�em selhalo: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "data zašifrována veřejným klí�em: správný DEK\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "předpokládám %s šifrovaných dat\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "algoritmus IDEA není dostupný; optimisticky se jej pokusíme nahradit "
 "algoritmem %s\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROV�N�: zpráva nebyla chráněna proti porušení její integrity\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -6086,182 +6104,182 @@ msgstr ""
 "Pokyn: Pokud tato zpráva byla vytvořena před rokem 2003, je pravděpodobné,\n"
 "že je legitimní. Tehdy se totiž ochrana integrity příliš nepoužívala.\n"
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Dešifrování lze vynutit volbou „%s“.\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "vynucené dešifrování selhalo!\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "dešifrování o.k.\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROV�N�: se zašifrovanou zprávou bylo manipulováno!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dešifrování selhalo: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Poznámka: odesílatel považoval data za důvěrná („for-your-eyes-only“)\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "původní jméno souboru='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatný revoka�ní certifikát – použijte „gpg --import“, chcete-li jej "
 "užít\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, c-format
 msgid "no signature found\n"
 msgstr "nenalezen žádná podpis\n"
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ŠPATN� podpis od „%s“"
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypršenou platností od „%s“"
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobrý podpis od „%s“"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potla�ena\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neumím pracovat s těmito nejednozna�nými daty\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpis vytvořen %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               použití %s klí�e %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpis vytvořen %s pomocí klí�e %s s ID uživatele %s\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               vydavatel „%s“\n"
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Klí� k dispozici na: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "Poznámka: Použijte „%s“ pro využití těchto údajů\n"
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[nejistý]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias „%s“"
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "POZOR: Tento klí� se nehodí na podepisování v režimu %s\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnost podpisu skon�ila %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnost podpisu skon�í %s\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "podpis %s, hashovací algoritmus %s%s%s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "binární formát"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "textový formát"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "neznámý formát"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 msgid ", key algorithm "
 msgstr ", algoritmus klí�e"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "POZOR: nejedná se o oddělený podpis. Soubor „%s“ NEBYL ověřen!\n"
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ověřit podpis: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "toto není podpis oddělený od dokumentu\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "VAROV�N�: detekováno více podpisů. Kontrolován bude pouze první.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatný podpis třídy 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starého typu (PGP 2.x)\n"
@@ -6333,11 +6351,6 @@ msgstr "(podrobnosti: "
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: použití parametru „%s“ se nedoporu�uje\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "VAROV�N�: používání parametru „%s“ se nedoporu�uje\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7420,133 +7433,133 @@ msgstr "chyba při �tení v „%s“: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "databáze důvěry: synchronizace selhala %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "pro „%s“ nelze vytvořit zámek\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "„%s“ nelze zamknout\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "záznam v databázi důvěry %lu: lseek() se nepodařil: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "záznam v databázi důvěry %lu: zápis se nepodařil (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "transakce s databází důvěry je příliš dlouhá\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: adresář neexistuje!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "k „%s“ nelze přistoupit: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepodařilo se vytvořit záznam verze: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: vytvořena neplatná databáze důvěry\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: databáze důvěry vytvořena\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Poznámka: do databáze důvěry nelze zapisovat\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatná databáze důvěry\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepodařilo se vytvořit hashovací tabulku: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba při aktualizaci záznamu verze: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba při �tení záznamu verze: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: chyba při zápisu záznamu verze: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "databáze důvěry: procedura lseek() selhala: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "databáze důvěry: procedura read() (n=%d) selhala: %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: není soubor databáze důvěry\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: záznam verze s �íslem %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatná verze souboru %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: chyba při �tení volného záznamu: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: chyba při zápisu adresářového záznamu: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulování záznamu selhalo: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: přidání záznamu selhalo: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Chyba: Databáze důvěry je poškozena.\n"
@@ -8198,16 +8211,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%sČíslo: %s%%0ADržitel: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Zbývá pokusů: %d"
@@ -8248,10 +8261,10 @@ msgstr "|A|Prosím, zadejte PIN správce"
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "|P|Prosím, zadejte kód pro odblokování (PUK) standardních klí�ů."
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "funkce PIN callback skon�ila chybou: %s\n"
@@ -8273,57 +8286,57 @@ msgstr "PIN pro CHV%d je příliš krátký; minimální délka je %d\n"
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr "klí� již existuje\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "existující klí� bude přepsán\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr "generování nového klí�e\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, c-format
 msgid "writing new key\n"
 msgstr "nový klí� se zapisuje\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nelze uložit klí�: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpově� neobsahuje modulus RSA\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpově� neobsahuje veřejný exponent RSA\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "odpově� neobsahuje veřejný klí� EC\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "prosím po�kejte než bude klí� vygenerován…\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr "generování klí�e se nezdařilo\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8331,67 +8344,67 @@ msgstr[0] "generování klí�e dokon�eno (%d sekunda)\n"
 msgstr[1] "generování klí�e dokon�eno (%d sekundy)\n"
 msgstr[2] "generování klí�e dokon�eno (%d sekund)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "odpově� neobsahuje veřejný klí�\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 "||Prosím, zadejte PIN klí�e ur�eného na tvorbu kvalifikovaných podpisů."
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Prosím, zadejte PIN správce"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Prosím, zadejte kód pro odblokování (PUK) standardních klí�ů."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Prosím, zadejte PIN pro standardní klí�e."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "schází RSA modulus nebo nemá velikost %d bitů\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "schází veřejný RSA exponent nebo je delší než %d bitů\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "NullPIN ještě nebyl změněn\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN ještě nebyl změněn\n"
 
 # TRANSLATORS: Do not translate the "|*|" prefixes but keep
 # them verbatim at the start of the string.  */
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Prosím, zadejte nový PIN pro standardní klí�e."
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|Prosím, zadejte nový kód pro odblokování (PUK) standardních klí�ů."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 "|N|Prosím, zadejte nový PIN klí�e ur�eného na tvorbu kvalifikovaných podpisů."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8399,7 +8412,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:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8407,27 +8420,27 @@ 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:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba při získání nového PINu: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "uložení otisku se nezdařilo: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "uložení data vytvoření se nezdařilo: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "chyba při získání CHV z karty\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�tení veřejného klí�e se nezdařilo: %s\n"
@@ -8435,43 +8448,43 @@ msgstr "�tení veřejného klí�e se nezdařilo: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sČíslo: %s%%0ADržitel: %s%%0APo�ítadlo: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "použije se výchozí PIN jako %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "použití výchozího PINu jako %s selhalo: %s – vypínám jeho budoucí použití\n"
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 msgid "||Please unlock the card"
 msgstr "||Prosím, odemkněte kartu"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN pro CHV%d je příliš krátký; minimální délka je %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "ověření CHV%d se nezdařilo: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzam�ena!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8483,20 +8496,20 @@ msgstr[1] ""
 msgstr[2] ""
 "Do trvalého uzam�ení karty zůstává %d pokusů na zadání PINu správce\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "přístup k příkazům správce není nakonfigurován\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 msgid "||Please enter the PIN"
 msgstr "||Prosím vložte PIN"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Prosím, zadejte reseta�ní kód karty"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Reseta�ní kód je příliš krátký; minimální délka je %d\n"
@@ -8504,78 +8517,78 @@ msgstr "Reseta�ní kód je příliš krátký; minimální délka je %d\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nový reseta�ní kód"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nový PIN správce"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr "|N|Nový PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Prosím, zadejte PIN správce a nový PIN správce"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Prosím, zadejte PIN a nový PIN"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr "chyba při �tení aplika�ních dat\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "chyba při �tení otisku DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "chybí �asové razítko vytvoření\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "schází RSA prime %s nebo nemá velikost %d bitů\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, c-format
 msgid "unsupported curve\n"
 msgstr "nepodporovaná křivka\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "neplatná struktura OpenPGP karty (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "otisk na kartě se neshoduje s požadovaným\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "karta nepodporuje hashovací algoritmus %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dosud vytvořené podpisy: %lu\n"
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "ověření PIN správce je nyní prostřednictvím tohoto příkazu zakázáno\n"
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "přístup na %s se nezdařil – vadná OpenPGP karta?\n"
@@ -8595,7 +8608,7 @@ msgstr "|N|Prvotní nový PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "pracovat ve více serverové režimu (na popředí)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|ÚROVEŇ|nastaví ladicí úroveň na ÚROVEŇ"
 
@@ -8639,11 +8652,11 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "zakázat používání správcovských příkazů karty"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Použití: @SCDAEMON@ [volby] (-h pro nápovědu)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8651,23 +8664,23 @@ msgstr ""
 "Syntaxe: scdaemon [volby] [příkaz [argumenty]]\n"
 "Démon pro �ipové karty (smartcard) pro @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "prosím, použijte volbu „--daemon“, chcete-li nechat běžet program na pozadí\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "obsluha pro deskriptor %d spuštěna\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "obsluha pro deskriptor %d ukon�ena\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -8893,7 +8906,7 @@ msgstr "kořenový certifikát není ozna�en jako důvěryhodný"
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola seznamu důvěry se nepodařila: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "řetěz certifikátů je příliš dlouhý\n"
@@ -8949,7 +8962,7 @@ msgstr "%ubitový hash není platná pro %ubitový %s klí�\n"
 
 # Yet another expression for `not enough memory' :)
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
@@ -8998,42 +9011,42 @@ msgstr ""
 "sériové �íslo %s, ID 0x%08lX,\n"
 "vytvořen %s, platnost vyprší %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "žádné použití klí�e není ur�eno – předpokládají se všechna použití\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "certifikát neměl být použit pro certifikování\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certifikát neměl být použit pro podepsání OCSP odpovědi\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certifikát neměl použit pro šifrování\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certifikát neměl být použit pro podepsání\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certifikát není použitelný pro šifrování\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certifikát není použitelný pro podepisování\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9223,6 +9236,11 @@ msgstr "Vytvořit sám sebou podepsaný certifikát? (a/N)"
 msgid "These parameters are used:\n"
 msgstr "Budou použity tyto parametry:\n"
 
+#: sm/certreqgen-ui.c:433
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "chyba při vytváření do�asného souboru: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr "Nyní se vytváří sám sebou podepsaný certifikát. "
@@ -9297,123 +9315,123 @@ msgstr "smazání certifikátu „%s“ se nezdařilo: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(nebyli zadáni Žádní platní příjemci)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "list external keys"
 msgstr "vypsat seznam externích klí�ů"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "list certificate chain"
 msgstr "vypsat řetěz certifikátů"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 msgid "import certificates"
 msgstr "importovat certifikáty"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "export certificates"
 msgstr "exportovat certifikáty"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr "zaregistrovat �ipovou kartu"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr "předat příkaz do dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr "vyvolat gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "vůbec nepoužívat terminál"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr "|N|po�et certifikátů, které zahrnout"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr "|SOUBOR|vzít politiky ze SOUBORU"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr "předpokládat vstup ve formátu PEM"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr "předpokládat vstup ve formátu Base-64"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr "předpokládat vstup v binárním formátu"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 msgid "create base-64 encoded output"
 msgstr "vytvářet výstup zakódovaný pomocí Base-64"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|ID_UŽIVATELE|použít ID_UŽIVATELE jako implicitní tajný klí�"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|SOUBOR|přidat klí�enku na seznam klí�enek"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr "stahovat chybějící certifikáty vydavatelů"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|N�ZEV|používat kódování N�ZEV pro PKCS#12 hesla"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr "nikdy nenahlížet do CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr "neprověřovat kořenové certifikáty proti CRL"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr "kontrolovat platnost pomocí OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr "nekontrolovat politiky certifikátu"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|N�ZEV|použít šifrovací algoritmus N�ZEV"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|N�ZEV|použít hashovací algoritmus N�ZEV"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "dávkový režim: nikdy se neptat"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "předpokládat ano na většinu otázek"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "předpokládat ne na většinu otázek"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 msgid "|FILE|write an audit log to FILE"
 msgstr "|SOUBOR|zapisovat auditní protokol do SOUBORU"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Použití: @GPGSM@ [možnosti] [soubory] (-h pro pomoc)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9423,27 +9441,27 @@ msgstr ""
 "Podepisuje, ověřuje, šifruje nebo dešifruje pomocí protokolu S/MIME.\n"
 "Výchozí operace závisí na vstupních datech.\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Poznámka: nebude možné šifrovat pro „%s“: %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "neznámý model ověřování „%s“\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importují se běžné certifikáty „%s“\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nelze podepsat pomocí „%s“: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "neplatný příkaz (neexistuje žádný implicitní příkaz)\n"
@@ -9473,7 +9491,7 @@ msgstr "chyba při získání uložených příznaků: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "chyba při importování certifikátu: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba při �tení vstupu: %s\n"
@@ -9514,7 +9532,7 @@ msgstr "problém při opakovaném hledání certifikátu: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "chyba při ukládání příznaků: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Chyba – "
 
@@ -9893,11 +9911,6 @@ msgstr "vytvoření do�asného kešového dir souboru „%s“ selhalo: %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "chyba při uzavírání „%s“: %s\n"
 
-#: dirmngr/crlcache.c:948
-#, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "chyba při přejmenování „%s“ na „%s“: %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
@@ -10583,93 +10596,93 @@ msgstr "platné úrovně ladění jsou: %s\n"
 msgid "usage: %s [options] "
 msgstr "použití: %s [volby] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "dvojte�ky v názvu socketu jsou nepřípustné\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "stahování CRL z „%s“ selhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "zpracování CRL z „%s“ selhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: řádek je příliš dlouhý – přesko�en\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: zjištěn neplatný otisk\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: chyba �tení: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: nepořádek na konci řádku ignorován\n"
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "přijat SIGHUP – konfigurace bude znovu na�tena a keš vyprázdněna\n"
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "přijat SIGUSR2 – žádná akce nedefinována\n"
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "přijat SIGTERM – vypíná se…\n"
 
 # TODO: plural
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "přijat SIGTERM – stále aktivních spojení: %d\n"
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, c-format
 msgid "shutdown forced\n"
 msgstr "vypnutí vynuceno\n"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "přijat SIGINT – okamžité vypnutí\n"
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "přijat signál �. %d – žádná akce nedefinována\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "chyba přístupu k „%s“: status HTTP %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL „%s“ přesměrováno na „%s“ (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "příliš mnoho přesměrování\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "přesměrování změněno na „%s“\n"
@@ -11033,57 +11046,57 @@ msgstr "řetěz certifikátů je v pořádku\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certifikát neměl být použit pro podepsání CRL\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "stru�ný výstup"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr "vypisovat data v šestnáctkové soustavě"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr "dekódovat přijaté datové řádky"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr "připojit se k dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 #, fuzzy
 #| msgid "connect to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "připojit se k dirmngr"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|N�ZEV|připojit se na socket Assuanu s N�ZVEM"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADRESA|připojit se na socket Assuanu na ADRESE"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr "spustit server Assuan zadaný na příkazové řádce"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr "nepoužívat rozšířený režim připojení"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|SOUBOR|spustit příkazy ze SOUBORU při startu"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr "spustit /subst při startu"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Použití: @GPG@-connect-agent [volby] (-h pro nápovědu)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -11091,49 +11104,49 @@ msgstr ""
 "Syntaxe: @GPG@-connect-agent [volby]\n"
 "Připojí se na běžícího agenta a odesílá příkazy\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "volba „%s“ vyžaduje program a volitelné argumenty\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "volba „%s“ ignorovaná kvůli „%s“\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "přijímání řádku se nezdařilo: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "řádek je příliš dlouhý – přesko�en\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "řádek zkrácen, protože obsahoval znak \\0\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "neznámý příkaz „%s“\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "odesílání řádku selhalo: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr "v této relaci neběží žádný dirmngr\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "chyba při odesílání standardního parametru: %s\n"
@@ -11195,12 +11208,12 @@ msgstr "Selhalo externí ověření komponenty %s"
 msgid "Note that group specifications are ignored\n"
 msgstr "Vezměte na vědomí, že ur�ení skupiny se ignoruje\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "chyba při uzavírání „%s“\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "chyba při rozboru „%s“\n"
@@ -11390,6 +11403,12 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "chyba při zápisu do do�asného souboru: %s\n"
+
+#~ msgid "run in supervised mode"
+#~ msgstr "poběží v režimu dohledu"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Jméno nemůže za�ínat �íslicí\n"
 
@@ -11726,9 +11745,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "%s nelze otevřít pro zápis: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "chyba při zápisu do %s: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "chyba při zavírání chyba %s: %s\n"
 
diff --git a/po/da.gmo b/po/da.gmo
index 217d9b6..3d675a9 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 1e227dd..b3ab021 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2017-11-02 17:39+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -24,7 +24,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "kunne ikke indhente pinentry-lås: %s\n"
@@ -35,59 +35,59 @@ msgstr "kunne ikke indhente pinentry-lås: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "_O.k."
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "_Afbryd"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_Yes"
 msgstr "_O.k."
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_No"
 msgstr "_O.k."
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 #| msgid "|pinentry-label|_Cancel"
 msgid "|pinentry-label|_Save in password manager"
 msgstr "_Afbryd"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "Enter new passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "Indtast ny adgangsfrase"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -98,7 +98,7 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -112,14 +112,14 @@ msgstr ""
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -127,7 +127,7 @@ msgstr "Adgangsfrase er for lang"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -137,7 +137,7 @@ msgstr "Kvalitet:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Denne række indikerer kvaliteten for ovenstående angivne adgangskode.\n"
@@ -146,7 +146,7 @@ msgstr ""
 "specialtegn. Spørg din administrator om mere præcis information om\n"
 "hvordan man anvender sikre adgangskoder."
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -154,7 +154,7 @@ msgstr ""
 "Indtast venligst din PIN, så at den hemmelige nøgle kan låses op for denne "
 "session"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -162,76 +162,76 @@ msgstr ""
 "Indtast din adgangsfrase, så at den hemmelige nøgle kan låses op for denne "
 "session"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Adgangsfrase:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "matcher ikke - prøv igen"
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (forsøg %d af %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 msgid "PIN too long"
 msgstr "PIN er for lang"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 msgid "Passphrase too long"
 msgstr "Adgangsfrase er for lang"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 msgid "Invalid characters in PIN"
 msgstr "Ugyldige tegn i PIN"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr "PIN er for kort"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad PIN"
 msgstr "Ugyldig PIN"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad Passphrase"
 msgstr "Ugyldig adgangsfrase"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Genindtast venligst denne adgangsfrase"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, 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:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -255,9 +255,9 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nøgler større end %d bit er ikke understøttet\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
@@ -265,15 +265,15 @@ msgstr "kan ikke oprette »%s«: %s\n"
 
 #: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, 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:2513
+#: agent/command-ssh.c:2467
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting list of cards: %s\n"
 msgstr "fejl ved indhentelse af gemte flag: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, 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:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Tillad"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Nægt"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Indtast venligst adgangsfrasen for ssh-nøglen%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -321,90 +321,82 @@ 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:3708
+#: agent/command-ssh.c:3797
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "kunne ikke oprette strøm fra sokkel: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Indsæt venligst kortet med serielnummeret"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "Administrator-PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Nulstillingskode"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0ABrug læserens numeriske tastatur for indtastning."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Gentag denne nulstillingskode"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Gentag denne PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Gentag denne PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Nulstillingskode er ikke korrekt gentaget; prøv igen"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK er ikke korrekt gentaget; prøv igen"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN er ikke korrekt gentaget; prøv igen"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Indtast venligst PIN'en%s%s%s for at låse kortet op"
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "fejl ved oprettelse af midlertidig fil: %s\n"
-
-#: agent/genkey.c:150
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "fejl ved skrivning til midlertidig fil: %s\n"
+#: agent/genkey.c:154
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "fejl ved skrivning til »%s«: %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 msgid "Enter new passphrase"
 msgstr "Indtast ny adgangsfrase"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 "Du har ikke indtastet en adgangsfrase!%0AEn tom adgangsfrase er ikke tilladt."
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -413,11 +405,11 @@ msgstr ""
 "Du har ikke indtastet en adgangsfrase - dette er generelt en dårlig ide!"
 "%0ABekræft venligst at du ikke ønsker beskyttelse på din nøgle."
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr "Ja, beskyttelse er ikke krævet"
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -425,7 +417,7 @@ msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "Navn skal være mindst 5 bogstaver langt\n"
 msgstr[1] "Navn skal være mindst 5 bogstaver langt\n"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -443,7 +435,7 @@ msgstr[1] ""
 "Advarsel: Du har indtastet en usikker adgangsfrase.%%0AEn adgangsfrase skal "
 "indeholde mindst %u cifre eller%%0specielle tegn."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase may not "
@@ -453,7 +445,7 @@ msgstr ""
 "Advarsel: Du har indtastet en usikker adgangsfrase.%%0AEn adgangsfrase må "
 "ikke være en kendt term eller matche%%0Aet bestemt mønster."
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 #, fuzzy
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -466,244 +458,238 @@ msgstr ""
 "Advarsel: Du har indtastet en usikker adgangsfrase.%%0AEn adgangsfrase skal "
 "være mindst %u tegn langt."
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 msgid "Take this one anyway"
 msgstr "Brug denne alligevel"
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Indtast venligst adgangsfrasen %0Afor at beskytte din nye nøgle"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 msgid "Please enter the new passphrase"
 msgstr "Indtast venligst den nye adgangsfrase"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Tilvalg nyttige for fejlsøgning"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr "kør i dæmontilstand (baggrunden)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr "kør i servertilstand (forgrunden)"
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-#, fuzzy
-#| msgid "run in server mode"
-msgid "run in supervised mode"
-msgstr "kør i servertilstand"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr "frakobl ikke fra konsollen"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr "kommandoresultat i sh-stil"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr "kommandoresultat i csh-stil"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|læs tilvalg fra FIL"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr "Tilvalg der kontrollerer det diagnostiske resultat"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "uddybende"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "vær mindre uddybende"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|skriv servertilstandslogge til FIL"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr "Tilvalg der kontrollerer konfigurationen"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "brug ikke SCdaemon'en"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|brug PGM som SCdaemon-program"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|brug PGM som SCdaemon-program"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|connect to Assuan socket NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|forbind til Assuansokkel NAVN"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignorer forespørgsler om at ændre TTY'en"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignorer forespørgsler om at ændre X-skærmen"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "aktiver ssh-agent-emulering"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr ""
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 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:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|udløb mellemlagrede PIN'er efter N sekunder"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|udløb SSH-nøgler efter N sekunder"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|angive maksimal livsforløb for PIN-mellemlager til N sekunder"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|angive maksimal livsforløb for SSH-nøgle til N sekunder"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr "brug ikke PIN-mellemlageret når der underskrives"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 #, fuzzy
 #| msgid "do not allow the reuse of old passphrases"
 msgid "disallow the use of an external password cache"
 msgstr "tillad ikke genbrug af gamle adgangsfraser"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 #, fuzzy
 #| msgid "allow clients to mark keys as \"trusted\""
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "tillad klienter at markere nøgler som »trusted« (troværdige)"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 msgid "allow presetting passphrase"
 msgstr "tillad forhåndsindstilling af adgangsfrase"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr "Tilvalg der fremtvinger en adgangsfrasepolitik"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr "tillad ikke omgåelse af adgangsfrasepolitikken"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|angiv minimal krævet længde for nye adgangsfraser til N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|kræv mindst N ikkealfanumeriske tegn for en ny adgangsfrase"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|kontroller nye adgangsfraser mod mønstre i FIL"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|giv adgangsfrasen udløb efter N dage"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 msgid "do not allow the reuse of old passphrases"
 msgstr "tillad ikke genbrug af gamle adgangsfraser"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Tilvalg der kontrollerer sikkerheden"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "fang ikke tastatur og mus"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|brug PGM som PIN-Entry-program"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 #, fuzzy
 #| msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|angive maksimal livsforløb for PIN-mellemlager til N sekunder"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Rapporter venligst fejl til <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -715,143 +701,148 @@ msgstr ""
 "Syntaks: gpg-agent [tilvalg] [kommando [parametre]]\n"
 "Hemmelig nøglehåndtering for GnuPG\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, fuzzy, c-format
 #| msgid "invalid debug-level `%s' given\n"
 msgid "invalid debug-level '%s' given\n"
 msgstr "ugyldigt fejlsøgningsniveau »%s« angivet\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgt sammendragsalgoritme er ugyldig\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "læser tilvalg fra »%s«\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ADVARSEL: »%s« er en forældet indstilling\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke oprette sokkel: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, 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:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "fejl ved indhentelse af nonce for soklen\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, 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:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, 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:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, 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:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, 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:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: 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:2381
+#: agent/gpg-agent.c:2391
 #, 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:2385
+#: agent/gpg-agent.c:2395
 #, 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:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, 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:2747
+#: agent/gpg-agent.c:2757
 #, 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:2752
+#: agent/gpg-agent.c:2762
 #, 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:2827
+#: agent/gpg-agent.c:2837
 #, 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:2832
+#: agent/gpg-agent.c:2842
 #, 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:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, 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:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppet\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kører i denne session\n"
@@ -876,7 +867,7 @@ msgstr ""
 "Syntaks: gpg-preset-passphrase [tilvalg] KEYGRIP\n"
 "Adgangskode for mellemlagervedligeholdelse\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -886,7 +877,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -944,49 +935,49 @@ msgstr "afbrudt\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fejl ved oprettelse af adgangsfrasen: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening '%s': %s\n"
 msgstr "fejl ved åbning af »%s«: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 #| msgid "file `%s', line %d: %s\n"
 msgid "file '%s', line %d: %s\n"
 msgstr "fil »%s«, linje %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 #| msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "udtryk »%s« ignoreret i »%s«, linje %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 #| msgid "system trustlist `%s' not available\n"
 msgid "system trustlist '%s' not available\n"
 msgstr "troværdig liste for systemet »%s« er ikke tilgængelig\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 #| msgid "bad fingerprint in `%s', line %d\n"
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "ugyldigt fingeraftryk i »%s«, linje %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 #| msgid "invalid keyflag in `%s', line %d\n"
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "ugyldigt nøgleflag i »%s«, linje %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, fuzzy, c-format
 #| msgid "error reading `%s', line %d: %s\n"
 msgid "error reading '%s', line %d: %s\n"
 msgstr "fejl ved læsning af »%s«, linje %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "fejl ved læsning af liste over betroede rodcertifikater\n"
@@ -999,7 +990,7 @@ msgstr "fejl ved læsning af liste over betroede rodcertifikater\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -1008,11 +999,11 @@ msgstr ""
 "Stoler du fuldstændig på at%%0A  \"%s\"%%0Akorrekt certificerer "
 "brugercertifikater?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr "Nej"
@@ -1025,7 +1016,7 @@ msgstr "Nej"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -1037,20 +1028,26 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr "Korrekt"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr "Forkert"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "fejl ved læsning af »%s«: %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Bemærk: Denne adgangsfrase er aldrig blevet ændret.%0AÆndr den nu."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -1059,15 +1056,29 @@ msgstr ""
 "Denne adgangsfrase er ikke blevet ændret%%0Asiden %.4s-%.2s-%.2s. Ændr den "
 "nu."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 msgid "Change passphrase"
 msgstr "Ændr adgangsfrasen"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr "Jeg ændrer den senere"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr "Indsæt venligst kortet med serielnummeret"
+
+#: 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?"
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+"En ssh-proces anmodte om brugen af nøgle%%0A  %s%%0A  (%s)%%0AØnsker du at "
+"tillade dette"
+
+#: agent/findkey.c:1741
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -1075,13 +1086,13 @@ msgid ""
 "%%0A?"
 msgstr "Vil du virkelig slette de valgte nøgler? (j/N) "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
 msgstr "aktiver nøgle"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1104,7 +1115,7 @@ msgstr "%s-nøglen bruger en usikker (%u bit) hash\n"
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "en %u-bit-hash er ikke gyldig for en %u-bit %s-nøgle\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrol af oprettet underskrift mislykkedes: %s\n"
@@ -1147,7 +1158,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "fejl ved forgrening af proces: %s\n"
@@ -1213,13 +1224,13 @@ 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:905
+#: common/sysutils.c:880
 #, fuzzy, c-format
 #| msgid "waiting %d seconds for the agent to come up\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "venter %d sekunder på at agenten kommer frem\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "renaming '%s' to '%s' failed: %s\n"
@@ -1446,7 +1457,7 @@ msgid "algorithm: %s"
 msgstr "algoritme: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "ikke understøttet algoritme: %s"
@@ -1603,7 +1614,7 @@ msgstr "konvertering fra »%s« til »%s« er ikke tilgængelig\n"
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open mislykkedes: %s:\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' failed: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
@@ -1646,7 +1657,7 @@ msgstr "lås »%s« er ikke udført: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "venter på lås %s ...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s er for gammel (kræver %s, har %s)\n"
@@ -1824,7 +1835,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
@@ -1870,7 +1881,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "opret et tilbagekaldscertifikat"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1898,7 +1909,7 @@ msgstr "kan ikke udføre dette i jobtilstand\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Denne kommando er kun tilgængelig for version 2-kort\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Nulstillingskode er ikke eller ikke mere tilgængelig\n"
@@ -1963,15 +1974,15 @@ msgstr "Adresse hvor offentlig nøgle skal hentes: "
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "fejl ved læsning af »%s«: %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, fuzzy, c-format
 #| msgid "error writing `%s': %s\n"
@@ -2334,27 +2345,27 @@ msgstr "Administratorkommandoer er ikke tilladt\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando (prøv »help«)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommando\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "kan ikke åbne »%s«\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "nøglen »%s« blev ikke fundet: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2417,8 +2428,8 @@ msgid "subkey"
 msgstr "Pubkey: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "opdatering mislykkedes: %s\n"
@@ -2482,15 +2493,15 @@ msgstr "du må ikke bruge chifferalgoritmen »%s« i tilstanden %s\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, fuzzy, c-format
 #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "du må ikke bruge chifferalgoritmen »%s« i tilstanden %s\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2516,7 +2527,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "ADVARSEL: »%s« er en forældet indstilling - den har ingen effekt\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2625,12 +2636,12 @@ msgstr "eksport af hemmelige nøgler er ikke tilladt\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "nøgle %s: nøgle i PGP 2.x-stil - udeladt\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, fuzzy, c-format
 #| msgid "error creating `%s': %s\n"
@@ -2700,297 +2711,297 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
 msgstr "manglende parameter for indstilling »%.50s«\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 msgid "make a signature"
 msgstr "opret en underskrift"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "make a clear text signature"
 msgstr "opret en underskrift i klartekst"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "opret en separat underskrift"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "krypter data"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "krypter kun med symmetrisk chiffer"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "afkrypter data (standard)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "godkend en underskrift"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "vis nøgler"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "vis nøgler og underskrifter"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr "vis og kontroller nøgleunderskrifter"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "vis nøgler og fingeraftryk"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "vis hemmelige nøgler"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "opret et tilbagekaldscertifikat"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "fjern nøgler fra den offentlige nøglering"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "fjern nøgler fra den hemmelige nøglering"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "underskriv en nøgle"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "underskriv en nøgle lokalt"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "opret et nyt nøglepar"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "underskriv en nøgle"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "underskriv en nøgle lokalt"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "underskriv eller rediger en nøgle"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "ændr en adgangsfrase"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "eksporter nøgler"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "eksporter nøgler til en nøgletjener"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "importer nøgler fra en nøgleserver"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "søg efter nøgler på en nøgleserver"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "opdater alle nøgler fra en nøgleserver"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "importer/sammenføj nøgler"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr "udskriv kortstatus"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr "ændr data på et kort"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr "ændr et korts PIN"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "opdater troværdighedsdatabasen"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid "print message digests"
 msgstr "vis beskedsammendrag"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "kør i servertilstand"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAVN som hemmelig standardnøgle"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|krypter også til bruger-id-NAVN"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|opsæt e-post-aliasser"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr "brug streng OpenPGP-opførsel"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "lav ingen ændringer"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "spørg før overskrivning"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Tilvalg der kontrollerer sikkerheden"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 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:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "opret ascii-pansrede uddata"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|skriv resultat til FIL"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "brug kanonisk teksttilstand"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|sæt komprimeringsniveauet til N (0 deaktiverer)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 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:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|brug MEKANISMER til at finde nøgler efter postadresser"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importer nøgler fra en nøgleserver"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "vis og kontroller nøgleunderskrifter"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "deaktiver al adgang til dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "Tilvalg der kontrollerer konfigurationen"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "vis hemmelige nøgler"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|krypter for BRUGER-ID"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|brug BRUGER-ID til at underskrive eller afkryptere"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2998,7 +3009,7 @@ msgstr ""
 "@\n"
 "(Se manualsiden for en fuldstændig liste over alle kommandoer og tilvalg)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -3028,14 +3039,14 @@ msgstr ""
 " --list-keys [navne]        vis nøgler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
 
 # Skal alt dette oversættes eller er det tilvalgene?
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -3050,7 +3061,7 @@ msgstr ""
 "Sign, check, encrypt eller decrypt\n"
 "standardhandling afhænger af inddata\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -3058,82 +3069,82 @@ msgstr ""
 "\n"
 "Understøttede algoritmer:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] %s\n"
 msgstr "brug: gpgsm [tilvalg] "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "kommandoer er i konflikt\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, fuzzy, c-format
 #| msgid "no = sign found in group definition `%s'\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "ingen = tegn fundet i gruppedefinition »%s«\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "ADVARSEL: Usikker ejerskab af hjemmemappe »%s«\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "ADVARSEL: Usikker ejerskab på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "ADVARSEL: Usikker ejerskab på udvidelse »%s«\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "ADVARSEL: Usikre rettigheder på hjemmemappe »%s«\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "ADVARSEL: Usikre rettigheder på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "ADVARSEL: Usikre rettigheder på udvidelse »%s«\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "ADVARSEL: Usikkert indelukket mappeejerskab på hjemmemappe »%s«\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3142,19 +3153,19 @@ msgid ""
 msgstr ""
 "ADVARSEL: Usikkert indelukket mappeejerskab på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "ADVARSEL: Usikkert indelukket mappeejerskab på udvidelse »%s«\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "ADVARSEL: Usikre indelukkede mapperettigheder på hjemmemappe »%s«\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3164,492 +3175,492 @@ msgid ""
 msgstr ""
 "ADVARSEL: Usikre indelukkede mapperettigheder på konfigurationsfil »%s«\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "ADVARSEL: Usikkert indelukket mapperettigheder på udvidelse »%s«\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "ukendt konfigurationspunkt »%s«\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr "vis billed-id'er under nøglevisninger"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, fuzzy
 #| msgid "show user ID validity during key listings"
 msgid "show key usage information during key listings"
 msgstr "vis bruger-id-validitet under nøglevisninger"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr "vil politikadresser under underskriftvisninger"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 msgid "show all notations during signature listings"
 msgstr "vis alle notationer under underskriftvisninger"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr "vis IETF-standardnotationer under underskriftvisninger"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr "vis brugerangivne notationer under underskriftvisninger"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "vis foretrukne nøgleserveradresser under underskriftvisninger"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr "vis bruger-id-validitet under nøglevisninger"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr "vis tilbagekaldte og udløbne bruger-id'er i nøglevisninger"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr "vis tilbagekaldte og udløbne undernøgler i nøglevisninger"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 msgid "show the keyring name in key listings"
 msgstr "vis nøgleringsnavnet i nøglevisninger"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 msgid "show expiration dates during signature listings"
 msgstr "vis udløbsdatoer under underskriftvisninger"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "ukendt tilvalg »%s«\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Denne kommando er ikke tilladt i tilstanden %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "BEMÆRK: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "»%s« er ikke et gyldigt underskriftudløb\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 #| msgid "line %d: not a valid email address\n"
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "linje %d: ikke en gyldig e-post-adresse\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 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:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 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:3314
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid character set\n"
 msgid "'%s' is not a valid character set\n"
 msgstr "»%s« er ikke et gyldigt tegnsæt\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke fortolke nøgleserveradresse\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige indstillinger for nøgleserver\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "ugyldige indstillinger for nøgleserver\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importindstillinger\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "ugyldige importindstillinger\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportindstillinger\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "ugyldige eksportindstillinger\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr "ugyldige listeindstillinger\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr "vis billed-id'er under underskriftverificering"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr "vis politikadresser under underskriftverificering"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 msgid "show all notations during signature verification"
 msgstr "vis alle notationer under underskriftverificering"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr "vis IETF-standardnotationer under underskriftverificering"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr "vis brugerangivne notationer under underskriftverificering"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "vis foretrukne nøgleserveradresser under underskriftverificering"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 msgid "show user ID validity during signature verification"
 msgstr "vis bruger-id-validitet under underskriftverificering"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "vis tilbagekaldte og udløbne bruger-id'er i underskriftverificering"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 msgid "show only the primary user ID in signature verification"
 msgstr "vis kun den primære bruger-id i underskriftverificering"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige verificeringsindstillinger\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr "ugyldige verificeringsindstillinger\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke angive kørselssti til %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig liste for auto-key-locate\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ugyldig liste for auto-key-locate\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "manglende parameter for indstilling »%.50s«\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: program kan oprette en kernefil!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overskriver %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsløs sammen med %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "ADVARSEL: kører med forfalsket systemtid: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "vil ikke køre med usikker hukommelse på grund af %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt chifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "valgt sammendragsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt komprimeringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt algoritme for certifikationssammendrag er ugyldig\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed skal være større end 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed skal være større end 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth skal være i intervallet fra 1 til 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldigt default-cert-level; skal være 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldigt min-cert-level; skal være 1, 2 eller 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BEMÆRK: simpel S2K-tilstand (0) frarådes på det skarpeste\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K-tilstand; skal være 0, 1 eller 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ugyldige standardpræferencer\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldige præferencer for personlig chiffer\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "ugyldige præferencer for personlig chiffer\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldige præferencer for personlig sammendrag\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldige præferencer for personlig komprimering\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "nøglestørrelse er ugyldig; bruger %u bit\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker endnu ikke med %s\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "du må ikke bruge chifferalgoritmen »%s« i tilstanden %s\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, fuzzy, c-format
 #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "du må ikke bruge komprimeringsalgoritmen »%s« i tilstanden %s\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TrustDB: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ADVARSEL: modtagere (-r) angivet uden brug af offentlig nøglekryptering\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, fuzzy, c-format
 #| msgid "symmetric encryption of `%s' failed: %s\n"
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetrisk kryptering af »%s« mislykkedes: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "du kan ikke bruge --symmetric --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "du kan ikke bruge --symmetric --encrypt i tilstanden %s\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "du kan ikke bruge --symmetric --sign --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "du kan ikke bruge --symmetric --sign --encrypt i tilstanden %s\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nøgleserver send mislykkedes: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nøgleserver modtag mislykkedes: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nøgleeksport mislykkedes: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "nøgleeksport mislykkedes: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nøgleserver søg mislykkedes: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "nøgleserver opdater mislykkedes: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af panser mislykkedes: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "påklædning af panser mislykkedes: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "ugyldig hash-algoritme »%s«\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error parsing key specification '%s': %s\n"
 msgstr "fejl ved lagring af certifikat: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "GÃ¥ til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivne adresse for certifikatpolitik er ugyldig\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivne adresse for underskriftpolitik er ugyldig\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivne adresse for foretrukken nøgleserver er ugyldig\n"
@@ -3662,7 +3673,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation til denne FD"
 
@@ -4410,7 +4421,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du sikker på, at du stadig vil underskrive (j/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  Kunne ikke underskrive.\n"
 
@@ -4593,8 +4604,8 @@ msgstr "Jeg har omhyggeligt kontrolleret denne nøgle.\n"
 msgid "Really sign? (y/N) "
 msgstr "Underskriv? (j/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "underskrift mislykkedes: %s\n"
@@ -4810,7 +4821,7 @@ msgstr ""
 "tnrsign\n"
 "  etc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "Nøglen er tilbagekaldt."
 
@@ -4861,7 +4872,7 @@ msgstr "Vil du virkelig fjerne denne bruger-id? (j/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Vil du virkelig flytte den primære nøgle? (j/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr "Du skal vælge præcis en nøgle.\n"
 
@@ -4939,175 +4950,175 @@ msgstr "Gem ændringer? (j/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? (j/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Nøgle ikke ændret så ingen opdatering krævet.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "Du kan ikke slette den sidste bruger-id!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "revoking the user ID failed: %s\n"
 msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "setting the primary user ID failed: %s\n"
 msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "ugyldig fingeraftryk"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, fuzzy, c-format
 #| msgid "failed to get the fingerprint\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "kunne ikke indhente fingeraftrykket\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "ugyldig værdi\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Ingen sådan bruger-id.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 #| msgid "Nothing to sign with key %s\n"
 msgid "Nothing to sign.\n"
 msgstr "Intet at underskrive med nøgle %s\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Ikke underskrevet af dig.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "kontrol af oprettet underskrift mislykkedes: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid expiration time\n"
 msgstr "»%s« er ikke et gyldigt underskriftudløb\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "ugyldig fingeraftryk"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "nøglen »%s« blev ikke fundet: %s\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Sammendrag: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr "Nøgleserver no-modify"
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr "Fortrukken nøgleserver: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Der er ingen præferencer på en bruger-id i PGP 2.x-stil.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Den følgende nøgle blev tilbagekaldt den %s af %s nøgle %s\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Denne nøgle er tilbagekaldt af %s nøgle %s"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "oprettet: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr "tilbagekaldt: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr "udløbet: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "udløber: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr "brug: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr "kortnr.: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr "troværdighed: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr "validitet: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Denne nøgle er blevet deaktiveret"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5115,17 +5126,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr "tilbagekaldt"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "udløbet"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5134,18 +5145,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:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Du kan ikke ændre udløbsdatoen for en v3-nøgle\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5155,35 +5166,37 @@ msgstr ""
 "medføre at\n"
 "          nogle version af PGP afviser denne nøgle.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker på, at du stadig ønsker at tilføje den? (j/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du må ikke tilføje et billed-id til en nøgle i PGP2-stil.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "Sådant et bruger-id findes allerede på denne nøgle!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slet denne gode underskrift? (j/N/a)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Slet denne ugyldige underskrift? (j/N/a)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Slet denne ukendte underskrift? (j/n/a)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Virkelig slette denne egenunderskrift? (j/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5191,20 +5204,20 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Slettede %d underskrift.\n"
 msgstr[1] "Slettede %d underskrift.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Intet slettet.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Bruger-id »%s« komprimeret: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
@@ -5212,17 +5225,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:4467
+#: g10/keyedit.c:4523
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Bruger-id »%s«: allerede minimeret\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Bruger-id »%s«: allerede ryddet\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5232,44 +5245,44 @@ msgstr ""
 "tilbagekalder\n"
 "          kan medføre at nogle versioner af PGP afviser denne nøgle.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Du må ikke tilføje en dedikeret tilbagekalder til en nøgle i PGP 2.x-stil.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast bruger'id for den dedikerede tilbagekalder: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "kan ikke udpege en nøgle i PGP 2.x-stil som dedikeret tilbagekalder\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "du kan ikke udpege en nøgle som dets egen dedikerede tilbagekalder\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "denne nøgle er allerede blevet dedikeret som en tilbagekalder\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ADVARSEL: Udpegning af en nøgle som en dedikeret tilbagekalder kan ikke "
 "fortrydes!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
 "tilbagekalder? (j/N) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5280,179 +5293,179 @@ msgstr ""
 "Er du sikker på, at du ønsker at udpege denne nøgle som en dedikeret "
 "tilbagekalder? (j/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ændrer udløbstidspunkt for en undernøgle.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ændrer udløbstidspunkt for den primære nøgle.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan ikke ændre udløbsdatoen for en v3-nøgle\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "Ændrer udløbstidspunkt for en undernøgle.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Ændrer udløbstidspunkt for den primære nøgle.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "underskriftsundernøgle %s er allerede krydscertificeret\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "undernøgle %s underskriver ikke og skal derfor ikke være krydscertificeret\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Vælg venligst præcis en bruger-id.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "udelader v3 egenunderskrift på bruger-id »%s«\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr "Indtast din foretrukne nøglerserveradresse: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker på, at du ønsker at erstatte den? (j/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker på, at du ønsker at slette den? (j/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 msgid "Enter the notation: "
 msgstr "Indtast notationen: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 msgid "Proceed? (y/N) "
 msgstr "Fortsæt? (j/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med hash %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, fuzzy, c-format
 #| msgid "No subkey with index %d\n"
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Ingen undernøgle med indeks %d\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernøgle med indeks %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: »%s«\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "underskrevet af din nøgle %s den %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (kan ikke eksporteres)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne underskrift udløb den %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Er du sikker på, at du ønsker at tilbagekalde den? (j/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Opret et tilbagekaldscertifikat for denne underskrift? (j/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Du har underskrevet disse bruger-id'er på nøgle %s:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr " (kan ikke tilbagekaldes)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "tilbagekaldt af din nøgle %s på %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du er i gang med at tilbagekalde disse underskrifter:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opret tilbagekaldscertifikaterne? (j/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "ingen hemmelig nøgle\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "bruger-id »%s« er allerede tilbagekaldt\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ADVARSEL: En bruger-id-underskrift er dateret %d sekunder inde i fremtiden\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Du kan ikke slette den sidste bruger-id!\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nøgle %s er allerede tilbagekaldt.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernøgle %s er allerede tilbagekaldt.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, 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"
@@ -5891,6 +5904,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Placer ikke e-post-adressen i fødselsnavnet eller kommentaren\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Sådant et bruger-id findes allerede på denne nøgle!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -6224,7 +6241,7 @@ msgstr "ugyldig nøgleserverprotokol (os %d!=håndtag %d)\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "»%s« er ikke et nøgle-id: udelader\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -6232,49 +6249,49 @@ msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "opdaterer %d nøgler fra %s\n"
 msgstr[1] "opdaterer %d nøgler fra %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ADVARSEL: Kan ikke opdatere nøgle %s via %s: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "nøgle »%s« blev ikke fundet på nøgleserver\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "nøgle blev ikke fundet på nøgleserver\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "anmoder om nøgle %s fra %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 #| msgid "no keyserver action!\n"
 msgid "no keyserver known\n"
 msgstr "ingen nøgleserverhandling!\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "udelod »%s«: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sender nøgle %s til %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 #| msgid "requesting key %s from %s\n"
 msgid "requesting key from '%s'\n"
 msgstr "anmoder om nøgle %s fra %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ADVARSEL: kan ikke hente URI %s: %s\n"
@@ -6307,244 +6324,244 @@ msgstr "krypteret med ukendt algoritme %d\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "adgangsfrase oprettet med ukendt sammendragsalgoritme %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr "offentlig nøgle er %s\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "krypteret med %u-bit %s nøgle, id %s, oprettet %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      »%s«\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krypteret med %s nøgle, id %s\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "ADVARSEL: flere klartekster set\n"
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypteret med %lu adgangsfraser\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypteret med 1 adgangsfrase\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "afkryptering af offentlig nøgle mislykkedes: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "krypterede data for offentlig nøgle: god DEK\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antager %s krypterede data\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA-chiffer utilgængelig, forsøger optimistisk at bruge %s i stedet for\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: besked var ikke integritetsbeskyttet\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "afkryptering mislykkedes: %s\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "afkryptering okay\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ADVARSEL: krypteret besked er blevet manipuleret!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "afkryptering mislykkedes: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "BEMÆRK: afsender anmodte om »for-your-eyes-only«\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "oprindeligt filnavn=»%.*s«\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "uafhængig tilbagekald - brug »gpg --import« for at anvende\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, c-format
 msgid "no signature found\n"
 msgstr "ingen underskrift fundet\n"
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "UGYLDIG underskrift fra »%s«"
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Udløbet underskrift fra »%s«"
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "God underskrift fra »%s«"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "underskriftverificering undertrykt\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan ikke håndtere disse tvetydige underskriftdata\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Underskrift lavet %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               bruger %s nøgle %s\n"
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Underskrift lavet %s med %s nøgle-id %s\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "       også kendt som »%s«"
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Nøgle tilgængelig på: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[usikker]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr "       også kendt som »%s«"
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 "ADVARSEL: Denne nøgle er ikke certificeret med en troværdig underskrift!\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Underskrift udløbet %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Underskrift udløber %s\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s underskrift, sammendragsalgoritme %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "binær"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "tekstilstand"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "ukendt"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 #, fuzzy
 #| msgid "algorithm: %s"
 msgid ", key algorithm "
 msgstr "algoritme: %s"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke kontrollere underskrift: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ikke en frakoblet underskrift\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
@@ -6552,12 +6569,12 @@ msgstr ""
 "ADVARSEL: flere underskrifter detekteret. Kun den første vil blive "
 "kontrolleret.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "uafhængig underskrift for klasse 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) underskrift\n"
@@ -6632,11 +6649,6 @@ msgstr ""
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: forældet indstilling »%s«\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "ADVARSEL: »%s« er en forældet indstilling\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7763,137 +7775,137 @@ msgstr "læsefejl i »%s«: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synkronisering mislykkedes: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 #| msgid "can't create lock for `%s'\n"
 msgid "can't create lock for '%s'\n"
 msgstr "kan ikke oprette lås for »%s«\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 #| msgid "can't lock `%s'\n"
 msgid "can't lock '%s'\n"
 msgstr "kan ikke låse »%s«\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek mislykkedes: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: skrivning mislykkedes (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "transaktion for trustdb er for stor\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: mappe findes ikke!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't access '%s': %s\n"
 msgstr "kan ikke tilgå »%s«: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: kunne ikke oprette versionspost: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ugyldig trustdb oprettet\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb oprettet\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "BEMÆRK: trustdb ikke skrivbar\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ugyldig trustdb\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: kunne ikke oprette hashtabel: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fejl ved opdatering af versionspost: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fejl ved læsning af versionspost: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fejl ved skrivning af versionspost: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek mislykkedes: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: læsning mislykkedes (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ikke en trustdb-fil\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versionspost med recnum %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ugyldig filversion %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: fejl ved læsning af fri post: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: fejl ved skrivning af mappepost: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: mislykkedes med at nulle en post: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: mislykkedes med at vedhæfte en post: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Fejl: trustdb er ødelagt.\n"
@@ -8534,16 +8546,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8584,10 +8596,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-tilbagekald returnerede fejl: %s\n"
@@ -8609,58 +8621,58 @@ msgstr "PIN for CHV%d er for kort; minimumlængde er %d\n"
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr "nøgle findes allerede\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "eksisterende nøgle vil blive erstattet\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr "opretter ny nøgle\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, c-format
 msgid "writing new key\n"
 msgstr "skriver ny nøgle\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "kunne ikke gemme nøglen: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "svar indeholder ikke RSA modulus'erne\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svar indeholder ikke den RSA-offentlige eksponent\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, fuzzy, c-format
 #| msgid "response does not contain the RSA public exponent\n"
 msgid "response does not contain the EC public key\n"
 msgstr "svar indeholder ikke den RSA-offentlige eksponent\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "vent venligst mens nøglen bliver oprettet ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr "oprettelse af nøgle mislykkedes\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8668,12 +8680,12 @@ msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "nøgleoprettelse færdig (%d sekunder)\n"
 msgstr[1] "nøgleoprettelse færdig (%d sekunder)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "svar indeholder ikke data for offentlig nøgle\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 "||Indtast venligst PIN'en for nøglen til at oprette kvalificerede "
@@ -8681,55 +8693,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:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Indtast venligst administrator-PIN'en"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Indtast venligst PIN Unblocking Code (PUK) for standardnøglerne."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Indtast venligst PIn'en for standardnøglerne."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA-modulus mangler eller har ikke størrelsen %d bit\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA offentlig eksponent mangler eller større end %d bit\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "NullPIN'en er endnu ikke ændret\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN'en er endnu ikke ændret\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Indtast venligst en ny PIN for standardnøglerne."
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|NP|Indtast venligst en ny PIN Unblocking Code (PUK) for standardnøglerne."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 "|N|Indtast venligst en ny PIN for nøglen til at oprette kvalificerede "
 "underskrifter."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8737,7 +8749,7 @@ msgstr ""
 "|NP|Indtast venligst en ny PIN Unblocking Code (PUK) for nøglen til at "
 "oprette kvalificerede underskrifter."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8745,27 +8757,27 @@ msgstr ""
 "|P|Indtast venligst PIN Unblocking Code (PUK) for nøglen til at oprette "
 "kvalificerede underskrifter."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fejl ved indhentelse af ny PIN: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "kunne ikke gemme fingeraftrykket: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "kunne ikke gemme oprettelsesdatoen: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "fejl ved indhentelse af CHV-status fra kort\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "læsning af offentlig nøgle mislykkedes: %s\n"
@@ -8773,46 +8785,46 @@ msgstr "læsning af offentlig nøgle mislykkedes: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "bruger standard-PIN som %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "kunne ikke bruge standard-PIN som %s: %s - deaktiverer yderligere "
 "standardbrug\n"
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||Indtast venligst PIN'en"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN for CHV%d er for kort; minimumlængde er %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificering af CHV%d mislykkedes: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kort er permanent låst!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, fuzzy, c-format
 #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@ -8821,20 +8833,20 @@ msgid_plural ""
 msgstr[0] "%d PIN-forsøg for administrator før kort permanent låses\n"
 msgstr[1] "%d PIN-forsøg for administrator før kort permanent låses\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "adgang til administratorkommandoer er ikke konfigureret\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 msgid "||Please enter the PIN"
 msgstr "||Indtast venligst PIN'en"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Indtast venligst nulstillingskoden for kortet"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Nulstillingskode er for kort; minimumlængde er %d\n"
@@ -8842,73 +8854,73 @@ msgstr "Nulstillingskode er for kort; minimumlængde er %d\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr "|RN|Ny nulstillingskode"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny administrator-PIN"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Indtast venligst administrator-PIN'en og ny administrator-PIN"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Indtast venligst PIN'en og ny PIN"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr "fejl ved læsning af programdata\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "fejl ved læsning af fingeraftryk DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "oprettelsestidsstempel mangler\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA-primtal %s mangler eller har ikke størrelsen %d bit\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported curve\n"
 msgstr "ikke understøttet algoritme: %s"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ugyldig struktur for OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "fingeraftryk på kort matcher ikke den anmodte\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kort understøtter ikke sammendragsalgoritme %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "underskrifter oprettet indtil videre: %lu\n"
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8916,7 +8928,7 @@ msgstr ""
 "verifikation af administrator-PIN er i øjeblikket forbudt via denne "
 "kommando\n"
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan ikke tilgå %s - ugyldig OpenPGP-kort?\n"
@@ -8936,7 +8948,7 @@ msgstr "|N|Oprindelig ny PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "kør i flerservertilstand (forgrund)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|angiv fejlsøgningsniveau til NIVEAU"
 
@@ -8980,13 +8992,13 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "nægt brugen af kommandoer for administratorkort"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Brug: gpgconf [tilvalg] (-h for hjælp)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 #, fuzzy
 #| msgid ""
 #| "Syntax: scdaemon [options] [command [args]]\n"
@@ -8998,7 +9010,7 @@ msgstr ""
 "Syntaks: scdaemon [tilvalg] kommando [parametre]]\n"
 "Smartcard-dæmon for GnuPG\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, fuzzy, c-format
 #| msgid ""
 #| "please use the option `--daemon' to run the program in the background\n"
@@ -9006,17 +9018,17 @@ msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "brug venligst tilvalget »--daemon« til at køre programmet i baggrunden\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "håndtering for fd %d startet\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "håndtering for fd %d termineret\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -9248,7 +9260,7 @@ msgstr "rodcertifikat er ikke markeret som troværdig"
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrol af troværdighedslisten mislykkedes: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certifikatkæde er for lang\n"
@@ -9303,7 +9315,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "en %u-bit-hash er ikke gyldig for en %u-bit %s-nøgle\n"
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
@@ -9349,42 +9361,42 @@ msgstr ""
 "S/N %s, id 0x%08lX,\n"
 "oprettet %s, udløber %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "ingen nøglebrug angivet - antager alle mulige brug\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "certifikat burde ikke være brugt for certificering\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certifikat burde ikke være brugt for OCSP-svarunderskrivning\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certifikat burde ikke være brugt for kryptering\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certifikat burde ikke være brugt for underskrift\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certifikat kan ikke bruges til kryptering\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certifikat kan ikke bruges til underskrivning\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 #| msgid "Included certificates"
 msgid "looking for another certificate\n"
@@ -9590,6 +9602,11 @@ msgstr "Opret et designet tilbagekaldscertifikat for denne nøgle? (j/N) "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:433
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "fejl ved oprettelse af midlertidig fil: %s\n"
+
 #: sm/certreqgen-ui.c:439
 #, fuzzy
 #| msgid "self-signed certificate has a BAD signature"
@@ -9668,125 +9685,125 @@ msgstr "sletning af certifikat »%s« mislykkedes: %s\n"
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige modtagere angivet\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "list external keys"
 msgstr "vis eksterne nøgler"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "list certificate chain"
 msgstr "vis certifikatkæde"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 msgid "import certificates"
 msgstr "importer certifikater"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "export certificates"
 msgstr "eksporter certifikater"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr "registrer et smartkort"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr "send en kommando til dirmngr'en"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr "opstart gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr "|N|antal certifikater der skal inkluderes"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|tag politikinformation fra FIL"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr "antag inddata er i PEM-format"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr "antag inddata er i base-64-format"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr "antag inddata er i binært format"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 msgid "create base-64 encoded output"
 msgstr "opret base-64-kodet resultat"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|brug BRUGER-ID som hemmelig standardnøgle"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|tilføj nøglering til nøgleringslisten"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr "hent manglende udstedercertifikater"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|brug kodnings-NAVN for PKCS#12-adgangsfraser"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr "konsulter aldrig en CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr "kontroller ikke CRL'er for rodcertifikater"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr "kontroller validitet med OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr "kontroller ikke certifikatpolitikker"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug chifferalgoritme NAVN"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug beskedsammendragsalgoritme NAVN"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "kørselstilstand: spørg aldrig"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spørgsmål"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spørgsmål"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|skriv en revisionslog til FIL"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hjælp)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgsm [options] [files]\n"
@@ -9801,31 +9818,31 @@ msgstr ""
 "Sign, check, encrypt eller decrypt med S/MIME-protokollen\n"
 "standardhandling afhænger af inddata\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, fuzzy, c-format
 #| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "BEMÆRK: kan ikke kryptere til »%s«: %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, fuzzy, c-format
 #| msgid "unknown validation model `%s'\n"
 msgid "unknown validation model '%s'\n"
 msgstr "ukendt valideringsmodel »%s«\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, fuzzy, c-format
 #| msgid "importing common certificates `%s'\n"
 msgid "importing common certificates '%s'\n"
 msgstr "importerer gængse certifikater »%s«\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, fuzzy, c-format
 #| msgid "can't sign using `%s': %s\n"
 msgid "can't sign using '%s': %s\n"
 msgstr "kan ikke underskrive med »%s«: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ugyldig kommando (der er ingen implict kommando)\n"
@@ -9855,7 +9872,7 @@ msgstr "fejl ved indhentelse af gemte flag: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "fejl under import af certifikat: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "fejl ved læsning af inddata: %s\n"
@@ -9897,7 +9914,7 @@ msgstr "problem under gensøgning af certifikat: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "fejl ved lagring af flag: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Fejl - "
 
@@ -10315,12 +10332,6 @@ msgstr "kunne ikke oprette midlertidig fil »%s«: %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "fejl ved lukning af %s: %s\n"
 
-#: dirmngr/crlcache.c:948
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "fejl ved læsning af »%s«: %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
@@ -11074,101 +11085,101 @@ msgstr "ugyldigt fejlsøgningsniveau »%s« angivet\n"
 msgid "usage: %s [options] "
 msgstr "brug: gpgsm [tilvalg] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, 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:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' failed: %s\n"
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "konvertering fra »%s« til »%s« mislykkedes: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, fuzzy, c-format
 #| msgid "line too long - skipped\n"
 msgid "%s:%u: line too long - skipped\n"
 msgstr "linje er for lang - udeladt\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "ugyldig fingeraftryk"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 #| msgid "read error in `%s': %s\n"
 msgid "%s:%u: read error: %s\n"
 msgstr "læsefejl i »%s«: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "ikke tvunget"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 #| msgid "error running `%s': exit status %d\n"
 msgid "error accessing '%s': http status %u\n"
 msgstr "fejl ved kørsel af »%s«: afslutningsstatus %d\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many redirections\n"
 msgstr "for mange chifferpræferencer\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11579,63 +11590,63 @@ msgstr "certifikat er gyldigt\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certifikat burde ikke være brugt for underskrift\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "stille"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr "vis data ud hex-kodet"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr "afkod modtagne datalinjer"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "connect to the dirmngr"
 msgstr "send en kommando til dirmngr'en"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "send en kommando til dirmngr'en"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|forbind til Assuansokkel NAVN"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 #, fuzzy
 #| msgid "|NAME|connect to Assuan socket NAME"
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|NAME|forbind til Assuansokkel NAVN"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr "kør Assuanserveren angivet på kommandolinjen"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr "brug ikke udvidet forbindelsestilstand"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|kør kommandoer fra FIL ved opstart"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr "kør /subst ved opstart"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 #, fuzzy
 #| msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Brug: gpg-connect-agent [tilvalg] (-h for hjælp)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-connect-agent [options]\n"
@@ -11647,50 +11658,50 @@ msgstr ""
 "Syntaks: gpg-connect-agent [tilvalg]\n"
 "Forbind til en kørende agent og send kommandoer\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "tilvalg »%s« kræver et program og valgfrie parametre\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "tilvalg »%s« ignoreret på grund af »%s«\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "modtagelse af linje mislykkedes: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "linje er for lang - udeladt\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "linje forkortet på grund af indlejret Nul-tegn\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, fuzzy, c-format
 #| msgid "unknown command `%s'\n"
 msgid "unknown command '%s'\n"
 msgstr "ukendt kommando »%s«\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "afsendelse af linje mislykkedes: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr "ingen gpg-agent kører i denne session\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "fejl under afsendelse af standardtilvalg: %s\n"
@@ -11758,13 +11769,13 @@ msgstr "Ekstern verifikation af komponent %s mislykkedes"
 msgid "Note that group specifications are ignored\n"
 msgstr "Bemærk at gruppespecifikationer ignoreres\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing '%s'\n"
 msgstr "fejl ved lukning af %s: %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
@@ -11972,6 +11983,14 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "fejl ved skrivning til midlertidig fil: %s\n"
+
+#, fuzzy
+#~| msgid "run in server mode"
+#~ msgid "run in supervised mode"
+#~ msgstr "kør i servertilstand"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Navn må ikke starte med et tal\n"
 
@@ -12324,9 +12343,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "kunne ikke åbne %s for skrivning: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "fejl ved skrivning til »%s«: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "fejl ved lukning af %s: %s\n"
 
diff --git a/po/de.gmo b/po/de.gmo
index 4cef8e4..1b0a343 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index d2c4e9f..6999834 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-04-21 16:55+0200\n"
-"PO-Revision-Date: 2021-12-29 16:20+0100\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
+"PO-Revision-Date: 2022-04-25 15:41+0200\n"
 "Last-Translator: Werner Koch <wk@gnupg.org>\n"
 "Language-Team: German <de@li.org>\n"
 "Language: de\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Die Sperre für das Pinentry kann nicht gesetzt werden: %s\n"
@@ -30,51 +30,51 @@ msgstr "Die Sperre für das Pinentry kann nicht gesetzt werden: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "_Abbrechen"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "_Ja"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "_Nein"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "Im Passwordmanager _speichern"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr ""
 "Möchten Sie das eingegebene Passwort wirklich auf dem Bildschirm sichtbar "
 "machen?"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "Das Passwort sichtbar machen"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "Das Passwort unsichtbar machen"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr "FESTSTELLTASTE ist aktiviert"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr "Vorschlag"
 
@@ -85,27 +85,27 @@ msgstr "Vorschlag"
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr "Einen Vorschlag für ein gutes Passwort erzeugen."
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr "(Leerzeichen sind nicht Bestandteil des Passwortes)"
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 msgid "Passphrase Not Allowed"
 msgstr "Das Passwort ist nicht erlaubt"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Qualität:"
 
@@ -115,14 +115,14 @@ msgstr "Qualität:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Die Qualität des Passwortes, welches Sie oben eingegeben haben.\n"
 "Bitte fragen sie Ihren Systembeauftragten nach den\n"
 "Kriterien für die Messung der Qualität."
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -130,7 +130,7 @@ msgstr ""
 "Bitte geben Sie Ihre PIN ein, so daß der geheime Schlüssel benutzt werden "
 "kann"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -138,76 +138,76 @@ msgstr ""
 "Bitte geben Sie Ihr Passwort ein, so daß der geheime Schlüssel benutzt "
 "werden kann."
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Passwort:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "Keine Ãœbereinstimmung - bitte nochmal versuchen."
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (Versuch %d von %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr "Nochmal:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 msgid "PIN too long"
 msgstr "Die PIN ist zu lang"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 msgid "Passphrase too long"
 msgstr "Das Passwort ist zu lang!"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 msgid "Invalid characters in PIN"
 msgstr "Ungültige Zeichen in der PIN!"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr "Die PIN ist zu kurz!"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad PIN"
 msgstr "Falsche PIN!"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad Passphrase"
 msgstr "Falsches Passwort!"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr "Hinweis: Anfrage vom Webbrowser."
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr "Hinweis: Anfrage von einem anderen Rechner."
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Bitte geben Sie das Passwort noch einmal ein:"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, 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:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -230,24 +230,24 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "SSH Schlüssel von mehr als %d Bits werden nicht unterstützt\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, 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
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, 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:2513
+#: agent/command-ssh.c:2467
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "Fehler beim Holen der Liste der Karten: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, 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 Processs möchte folgenden Schlüssel verwenden:%%0A  %s%%0A  "
 "(%s)%%0AErlauben Sie dies?"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Erlauben"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Verweigern"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr ""
 "Bitte geben Sie das Passwort für den SSH-Schlüssel%%0A  %F%%0A  (%c)%%0Aein."
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -295,88 +295,79 @@ msgstr ""
 "Schlüssel%%0A   %s%%0A  %s%%0Aim Schlüsselspeicher des Gpg-Agenten zu "
 "schützen."
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "Das Erzeugen eines Datenstroms aus dem Socket schlug fehl: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Bitte legen Sie die Karte mit der folgenden Seriennummer ein"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "Admin-PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Rückstellcode"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr "Bitte die Bestätigungstaste des Tokens drücken."
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr "Zur Eingabe die Tastatur des Kartenlesers verwenden."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Rückstellcode bitte wiederholen"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "PUK bitte wiederholen"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "PIN bitte wiederholen"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Rückstellcode wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Bitte geben Sie die PIN%s%s%s ein, um die Karte zu entsperren"
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
-
-#: agent/genkey.c:150
+#: agent/genkey.c:154
 #, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "Fehler beim Schreiben auf eine temporäre Datei: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "Fehler beim Schreiben auf eine \"Pipe\": %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 msgid "Enter new passphrase"
 msgstr "Neues Passwort eingeben"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 "Sie haben kein Passwort eingegeben!%0AEine leeres Passwort ist nicht erlaubt."
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -386,18 +377,18 @@ msgstr ""
 "Bitte bestätigen Sie, daß sie auf den lokalen Schutz Ihres privaten\n"
 "Schlüssels verzichten."
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr "Ja, ein Schutz ist nicht notwendig"
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "Ein Passwort sollte mindestens %u Zeichen lang sein."
 msgstr[1] "Ein Passwort sollte mindestens %u Zeichen lang sein."
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -408,236 +399,232 @@ msgstr[0] ""
 msgstr[1] ""
 "Ein Passwort sollte mindestens %u Sonderzeichen oder%%0AZiffern enthalten."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Ein Passwort sollte kein bekanntes Wort sein oder%%0Anach bekannten Regeln "
 "aufgebaut sein."
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 "WARNUNG:  Sie haben ein offensichtlich unsicheres%0APasswort eingegeben."
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 msgid "Take this one anyway"
 msgstr "Dieses trotzdem benutzen"
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Bitte geben Sie das Passwort ein,%0Aum Ihren Schlüssel zu schützen."
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 msgid "Please enter the new passphrase"
 msgstr "Bitte geben Sie das Passwort ein:"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 msgid "Options used for startup"
 msgstr "Optionen zum Start des Programms"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr "Im Daemon Modus ausführen"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr "Im Server Modus ausführen"
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-msgid "run in supervised mode"
-msgstr "Im Supervised Modus ausführen"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr "Im Vordergrund laufen lassen"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr "Ausgabe für /bin/sh"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr "Ausgabe für /bin/csh"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 msgid "|FILE|read options from FILE"
 msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr "Optionen zur Einstellung der Diagnoseausgaben"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "Reduzierte Informationen"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr "Optionen zur Einstellung der Konfiguration"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "Den SCdaemon-basierten Kartenzugriff nicht nutzen"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|Benutze PGM als SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|Benutze PGM als tpm2daemon"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|Einige Kommandos über NAME annehmen"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "Ignoriere Anfragen, das TTY zu wechseln"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "Ignoriere Anfragen, das X-Display zu wechseln"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "SSH Unterstützung einschalten"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "Verwende ALGO für SSH Fingerabdrücke"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "PuTTY Unterstützung einschalten"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 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:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|Lasse PINs im Cache nach N Sekunden verfallen"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|Lasse SSH Schlüssel im Cache nach N Sekunden verfallen"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 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:246
+#: agent/gpg-agent.c:248
 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:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr "Benutze PINs im Cache nicht beim Signieren"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 msgid "disallow the use of an external password cache"
 msgstr "Verbiete die Verwendung eines externen Passwordmanagers"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "Verbiete Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 msgid "allow presetting passphrase"
 msgstr "Erlaube ein \"preset\" der Passwörter"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr "Optionen für Passwort Regeln"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr "Einhaltung der Passwort Regeln erzwingen"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|Setze die kleinste erlaubte Länge von Passwörtern auf N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|Verlange mindestens N Nicht-Buchstaben für ein neues Passwort"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|DATEI|Prüfe neue Passwörter gegen die Regeln in DATEI"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|Lasse das Passwort nach N Tagen verfallen"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 msgid "do not allow the reuse of old passphrases"
 msgstr "Verbiete die Wiedernutzung alter Passwörter."
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "Options controlling the PIN-Entry"
 msgstr "Optionen für das Pinentry"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 msgid "never use the PIN-entry"
 msgstr "Niemals das Pinentry benutzen"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr "Aufrufer darf das Pinentry nicht ersetzen"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "Tastatur und Maus \"grabben\""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|Benutze PGM as PIN-Entry"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|Setze die Pinentry Zeitüberschreitung auf N Sekunden"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "Erlaube die Eingabe eines Passwortes über Emacs"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Berichte über Programmfehler bitte in englisch an <@EMAIL@>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <de@li.org>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Gebrauch: @GPG_AGENT@ [Optionen] [Kommando [Argumente]]"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -645,131 +632,136 @@ msgstr ""
 "Syntax: @GPG_AGENT@ [Optionen] [Befehl [Argumente]]\n"
 "Verwaltung von geheimen Schlüsseln für @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "Socket kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Der Name des Sockets `%s' ist zu lang\n"
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, 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:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, 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:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, 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:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "Es wird auf Socket `%s' gehört\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "Verzeichnis `%s' erzeugt\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, 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:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, 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:2747
+#: agent/gpg-agent.c:2757
 #, 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:2752
+#: agent/gpg-agent.c:2762
 #, 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:2827
+#: agent/gpg-agent.c:2837
 #, 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:2832
+#: agent/gpg-agent.c:2842
 #, 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:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s angehalten\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "Der gpg-agent läuft nicht für diese Session\n"
@@ -794,7 +786,7 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
 "Pflege des Passwortpuffers\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -804,7 +796,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -861,45 +853,45 @@ msgstr "Vom Benutzer abgebrochen\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Fehler bei der Abfrage des Passwortes: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "Fehler beim Öffnen von `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "Datei `%s', Zeile %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr ""
 "Anweisung \"%s\" in `%s', Zeile %d\n"
 " ignoriert\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr ""
 "Systemliste der vertrauenswürdigen Zertifikate '%s' ist nicht vorhanden\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "fehlerhafter Fingerabdruck in `%s', Zeile %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "Ungültiges Schlüsselflag in `%s', Zeile %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "Fehler beim Lesen von `%s', Zeile %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "Fehler beim Lesen der Liste vertrauenswürdiger Wurzelzertifikate\n"
@@ -912,7 +904,7 @@ msgstr "Fehler beim Lesen der Liste vertrauenswürdiger Wurzelzertifikate\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -922,11 +914,11 @@ msgstr ""
 "\"%%0ABenutzerzertifikate verläßlich zertifiziert, so antworten Sie mit \"Ja"
 "\"."
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr "Nein"
@@ -939,7 +931,7 @@ msgstr "Nein"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -951,22 +943,27 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr "Korrekt"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr "Falsch"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "Fehler beim Umbenennen von `%s` nach `%s': %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Hinweis: Dieses Passwort wurde noch nie geändert/%0ABitte ändern Sie sie "
 "jetzt."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -975,15 +972,29 @@ msgstr ""
 "Dieses Passwort wurde seit dem %.4s-%.2s-%.2s nicht%%0A\n"
 "mehr geändert.  Bitte ändern Sie sie jetzt."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 msgid "Change passphrase"
 msgstr "Das Passwort ändern"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr "Ich werde sie später ändern"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr "Bitte legen Sie die Karte mit der folgenden Seriennummer ein"
+
+#: 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?"
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+"Ein SSH Processs möchte folgenden Schlüssel verwenden:%%0A  %s%%0A  "
+"(%s)%%0AErlauben Sie dies?"
+
+#: agent/findkey.c:1741
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -992,11 +1003,11 @@ msgstr ""
 "Möchten Sie den Schlüssel mit dem \"Keygrip\"%%0A  %s%%0A  %%C%%0Awirklich "
 "entfernen?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 msgid "Delete key"
 msgstr "Schlüssel löschen"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1022,7 +1033,7 @@ msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 "Ein %zu-Bit Hashverfahren ist für einen %u-Bit %s Schlüssel nicht möglich\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Prüfung der erstellten Signatur ist fehlgeschlagen: %s\n"
@@ -1061,7 +1072,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
@@ -1122,12 +1133,12 @@ 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:905
+#: common/sysutils.c:880
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "Warte bis auf die Datei '%s' zugegriffen werden kann ...\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "umbenennen von `%s' nach `%s' schlug fehl: %s\n"
@@ -1343,7 +1354,7 @@ msgid "algorithm: %s"
 msgstr "Verfahren: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "Nicht unterstütztes Verfahren: %s"
@@ -1498,7 +1509,7 @@ msgstr "Umwandlung von `%s' in `%s' ist nicht verfügbar\n"
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open fehlgeschlagen: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "Umwandlung von `%s' in `%s' schlug fehl: %s\n"
@@ -1537,7 +1548,7 @@ msgstr "Dateisperre %s konnte nicht eingerichtet werden: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "Warten auf die Freigabe der Dateisperre `%s' ...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "Die Bibliothek %s ist nicht aktuell (benötige %s, habe %s)\n"
@@ -1707,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "Der Dirmngr läuft nicht für diese Session\n"
@@ -1747,7 +1758,7 @@ msgstr "HTTP Weiterleitung wurde gesäubert"
 msgid "server uses an invalid certificate"
 msgstr "Der Server benutzt eine ungültiges Zertifikat"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, c-format
 msgid "Note: %s\n"
 msgstr "Hinweis: %s\n"
@@ -1774,7 +1785,7 @@ msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Dieser Befehl ist nur für Karten ab Version 2 möglich.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Der Rückstellcode ist nicht vorhanden\n"
@@ -1840,14 +1851,14 @@ msgstr "URL um den öffentlichen Schlüssel zu holen: "
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
@@ -2181,26 +2192,26 @@ msgstr "Admin-Befehle sind nicht erlaubt\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Befehl\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 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,8 +2276,8 @@ msgid "subkey"
 msgstr "Unterschlüssel"
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Änderung fehlgeschlagen: %s\n"
@@ -2333,15 +2344,15 @@ msgstr ""
 msgid "(use option \"%s\" to override)\n"
 msgstr "(benutze Option \"%s\" zum hinwegsetzen)\n"
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "Das Verschlüsselungsverfahren %s darf im %s Modus nicht verwendet werden.\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2365,7 +2376,7 @@ 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:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2398,10 +2409,9 @@ msgid "option '%s' may not be used in %s mode\n"
 msgstr "Die Benutzung der Option \"%s\" ist im %s-Modus nicht erlaubt.\n"
 
 #: g10/decrypt-data.c:245
-#, fuzzy, c-format
-#| msgid "%s.%s encrypted data\n"
+#, c-format
 msgid "%s encrypted data\n"
-msgstr "%s.%s verschlüsselte Daten\n"
+msgstr "%s verschlüsselte Daten\n"
 
 #: g10/decrypt-data.c:248
 #, c-format
@@ -2469,12 +2479,12 @@ msgstr "Exportieren geheimer Schlüssel ist nicht erlaubt\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "Schlüssel %s: PGP 2.x-artiger Schlüssel - übersprungen\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, c-format
 msgid "error creating '%s': %s\n"
@@ -2542,270 +2552,270 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "Gültige Argumente für Option '%s':\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 msgid "make a signature"
 msgstr "Eine Signatur erzeugen"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "make a clear text signature"
 msgstr "Eine Klartextsignatur erzeugen"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Signatur erzeugen"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "Daten verschlüsseln"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlüsseln"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "Daten entschlüsseln (Voreinstellung)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "Signatur prüfen"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "Liste der Schlüssel"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "Liste der Schlüssel und ihrer Signaturen"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr "Signaturen der Schlüssel auflisten und prüfen"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "Ein neues Schlüsselpaar erzeugen"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 msgid "quickly generate a new key pair"
 msgstr "Schnell ein neues Schlüsselpaar erzeugen"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "quickly add a new user-id"
 msgstr "Schnell eine neue User-ID anfügen"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 msgid "quickly revoke a user-id"
 msgstr "Schnell eine User-ID widerrufen"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly set a new expiration date"
 msgstr "Schnell ein neues Ablaufdatum setzen"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr "Ein neues Schlüsselpaar erzeugen (alle Optionen)"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "Schlüssel aus dem geh. Schlüsselbund entfernen"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "quickly sign a key"
 msgstr "Schlüssel schnell signieren"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "quickly sign a key locally"
 msgstr "Schlüssel schnell nur für diesen Rechner signieren"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 msgid "quickly revoke a key signature"
 msgstr "Schnell eine Schlüsselsignatur widerrufen"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "Schlüssel signieren"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "Schlüssel nur für diesen Rechner signieren"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "Signieren oder bearbeiten eines Schlüssels"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "Das Passwort ändern"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "Schlüssel auf einem Schlü.server suchen"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "alle Schlüssel per Schlü.server aktualisieren"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "Schlüssel importieren/kombinieren"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr "den Karten-Status ausgeben"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr "Daten auf einer Karte ändern"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr "PIN einer Karte ändern"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "Ändern der \"Trust\"-Datenbank"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid "print message digests"
 msgstr "Hashwerte für die Dateien ausgeben"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "Im Server Modus ausführen"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|WERT|Setze die TOFU-Politik für einen Schlüssel"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schlüssel benutzen"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|Auch an NAME verschlüsseln"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|Email Alias festlegen"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr "OpenPGP-Verhalten strikt beachten"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "vor Ãœberschreiben nachfragen"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr "Optionen für die Eingabe"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr "Optionen für die Ausgabe"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|DATEI|Ausgabe auf DATEI schreiben"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr "Optionen für den Schlüsselimport und -export"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 "|MECHANISMEN|Benutze MECHANISMEN um Schlüssel über die Mailadresse "
 "aufzufinden."
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 msgid "import missing key from a signature"
 msgstr "Schlüssel aus der Signatur importieren"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 msgid "include the public key in signatures"
 msgstr "Schlüssel mit in die Signatur packen"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "Jeglichen Zugriff auf den Dirmngr verhindern"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr "Optionen für das Auflisten der Schlüssel"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 msgid "Options to specify keys"
 msgstr "Optionen zur Auswahl der Schlüssel"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|Verschlüsseln für USER-ID"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|Mit USER-ID signieren bzw. entschlüsseln"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr "Optionen für die Verwendung in Scripts"
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr "Weitere Optionen"
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2814,7 +2824,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
 "Optionen)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2834,11 +2844,11 @@ msgstr ""
 " --list-keys [Namen]        Schlüssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdrücke\" anzeigen\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Aufruf: @GPG@ [Optionen] [Dateien] (-h für Hilfe)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2848,7 +2858,7 @@ msgstr ""
 "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2856,75 +2866,75 @@ msgstr ""
 "\n"
 "Unterstützte Verfahren:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Öff. Schlüssel: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Verschlü.: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "Aufruf: %s [Optionen] %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverhältnis auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses für Home-"
 "Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2932,20 +2942,20 @@ msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses der "
 "Konfigurationsdatei '%s'\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverhältnis des umgebenden Verzeichnisses `%s'\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses des Home-"
 "Verzeichnisses `%s'\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2953,479 +2963,479 @@ msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
 "Konfigurationsdatei '%s'\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses auf "
 "Erweiterung `%s'\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 msgid "show key usage information during key listings"
 msgstr "Schlüsselverwendungszwecke mit den Schlüsseln anlisten"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr "Richtlinien-URL mit den Signaturen anlisten"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 msgid "show all notations during signature listings"
 msgstr "Alle Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr "Standard Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr "Benutzer-Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "Bevorzugten Schlüsselserver mit den Signaturen anlisten"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 msgid "show the keyring name in key listings"
 msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 msgid "show expiration dates during signature listings"
 msgstr "Das Ablaufdatum mit den Signaturen anlisten"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "Unbekannte TOFU Regel '%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(\"help\" um mögliche Werte anzuzeigen)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Dieser Befehl ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein gültiges Signaturablaufdatum\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" ist keine gültige E-Mailadresse\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "Ungültiger Subjekt-Name '%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "Ungültiges \"Herkunft\"-Argument '%s'\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "Ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import-Option\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "Ungültige Import-Option\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "Ungültige Filter-Option: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export-Option.\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "Ungültige Export-Option\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Listen-Option.\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr "Ungültige Listen-Option\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr "Foto-ID während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr "Richtlinien-URLs während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 msgid "show all notations during signature verification"
 msgstr "Alle Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr "Standard-Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr "Benutzer-Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "Die URL für den bevorzugten Schlüsselserver während der Signaturprüfung "
 "anzeigen"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 msgid "show user ID validity during signature verification"
 msgstr "Die Gültigkeit der User-ID während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "Zeige widerrufene und verfallene User-IDs während der Signaturprüfung"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 msgid "show only the primary user ID in signature verification"
 msgstr "Zeige nur die Haupt-User-ID während der Signaturprüfung"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "Ungültiges Argument für Option \"%.50s\"\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s zusammen mit %s ist nicht erlaubt!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "Startet nicht mit unsicherem Speicher, wegen Option %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, c-format
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "Das ausgewählte AEAD-Verfahren ist ungültig\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ungültiger \"default-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ungültiger \"min-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard-Voreinstellungen\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, c-format
 msgid "invalid personal AEAD preferences\n"
 msgstr "ungültige private AEAD-Voreinstellungen\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "Ungültige \"Chunk\"-Größe; %d wird verwendet\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "Das AEAD-Verfahren %s darf im %s Modus nicht verwendet werden.\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "Die Benutzung des Komprimierverfahren %s ist im %s Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WARNUNG: Empfänger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "Im %s Modus kann --symmetric --encrypt nicht verwendet werden.\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet "
 "werden\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 "Im %s Modus kann --symmetric --sign --encrypt nicht verwendet werden.\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "Schlüsselexport im SSH Format fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "Fehler in der Schlüsselangabe '%s': %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 "'%s\" sieht nicht nach einer gültigen Schlüssel-ID, einem Fingerabdruck oder "
 "einem \"Keygrip\" aus\n"
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 "WARNING:  Kein Kommando angegeben.  Versuche zu raten was gemeint ist ...\n"
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Signatur-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
@@ -3438,7 +3448,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
@@ -4168,7 +4178,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immer noch beglaubigen? (j/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  Beglaubigen ist nicht möglich.\n"
 
@@ -4346,8 +4356,8 @@ msgstr "Ich habe diesen Schlüssel sehr sorgfältig überprüft.\n"
 msgid "Really sign? (y/N) "
 msgstr "Wirklich signieren? (j/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -4549,7 +4559,7 @@ msgstr ""
 "Signaturen\n"
 " (\"nrsign\"), oder jede Kombination davon (\"ltsign\", \"tnrsign\", etc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "Schlüssel wurde widerrufen."
 
@@ -4597,7 +4607,7 @@ msgstr "Diese User-ID wirklich entfernen? (j/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Den Hauptschlüssel wirklich verschieben? (j/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr "Sie müssen genau einen Schlüssel auswählen.\n"
 
@@ -4676,161 +4686,161 @@ msgstr "Änderungen speichern? (j/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Beenden ohne zu speichern? (j/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Schlüssel ist nicht geändert worden, also ist kein Speichern nötig.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "Die letzte User-ID kann nicht widerrufen werden!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "Fehler beim Widerrufen der User-ID: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "Fehler beim Setzen der Haupt-User-ID: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" ist kein Fingerabdruck\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" ist nicht der Fingerabdruck des Hauptschlüssels\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Ungültige User-ID '%s': %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "No matching user IDs."
 msgstr "Keine passende User-ID"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "Nothing to sign.\n"
 msgstr "Nichts zu beglaubigen\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Nicht von Ihnen signiert.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "Fehler beim Widerruf der Schlüsselsignatur: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' ist kein gültiges Ablaufdatum\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" ist kein gültiger Fingerabdruck\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "Unterschlüssel \"%s\" nicht gefunden\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr "AEAD: "
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Eigenschaften: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr "Bevorzugter Schlüsselserver:"
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 msgid "Notations: "
 msgstr "\"Notationen\": "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-artige Schlüssel haben keine Voreinstellungen.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Der folgende Schlüssel wurde am %s von %s Schlüssel %s widerrufen\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Dieser Schlüssel kann von %s-Schlüssel %s widerrufen werden"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "erzeugt: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr "widerrufen: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr "verfallen: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "verfällt: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr "Nutzung: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr "Kartennummer:"
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr "Vertrauen: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr "Gültigkeit: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4838,18 +4848,18 @@ msgstr ""
 "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr "widerrufen"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "verfallen"
 
 # translated by wk
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4858,17 +4868,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:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "WARNUNG: Ihr Unterschlüssel zum Verschlüsseln wird bald verfallen.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Bitte erwägen Sie, dessen Verfallsdatum auch zu ändern.\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4878,72 +4888,72 @@ msgstr ""
 "könnte\n"
 "         bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Wollen Sie ihn immer noch hinzufügen? (j/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Sie können einem PGP2-artigen Schlüssel keine Foto-ID hinzufügen.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
-msgstr "Solch eine User-ID ist bereits für den Schlüssel vorhanden!\n"
+#: g10/keyedit.c:4329
+msgid "Such a user ID already exists on this key!"
+msgstr "Solch eine User-ID ist bereits für den Schlüssel vorhanden!"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, 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:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "ungültig"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User-ID \"%s\" bereits verkleinert: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User-ID \"%s\": bereits minimiert\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User-ID \"%s\": bereits sauber\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4953,221 +4963,221 @@ msgstr ""
 "         Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n"
 "         des Schlüssels führen.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Sie können einem PGP2-artigen Schlüssel keine vorgesehenen Widerrufer "
 "hinzufügen.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "Ein PGP 2.x-artiger Schlüssel kann nicht als vorgesehener Widerrufer "
 "eingetragen werden\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Ein Schlüssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "Dieser Schlüssel wurde bereits als ein Widerrufer vorgesehen\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "WARNUNG: Einen Schlüssel als vorgesehenen Widerrufer zu deklarieren, kann "
 "nicht rückgangig gemacht werden!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Möchten Sie diesen Schlüssel wirklich als vorgesehenen Widerrufer festlegen? "
 "(j/N): "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr ""
 "Möchten Sie wirklich die Verfallsdaten aller Unterschlüssel ändern? (j/N): "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändern des Verfallsdatums des Unterschlüssels.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 msgid "Changing usage of a subkey.\n"
 msgstr "Ändern des Schlüsselverwendungszweckes des Unterschlüssels.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 msgid "Changing usage of the primary key.\n"
 msgstr "Ändern des Schlüsselverwendungszweckes des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Signaturunterschlüssel %s ist bereits rücksigniert\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "Unterschlüssel %s ist des Signieren nicht mächtig und braucht deshalb keine "
 "Rücksignatur\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID auswählen.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Ãœberspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr "Geben Sie die URL Ihres bevorzugten Schlüsselservers ein: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie ihn wirklich ersetzen? (j/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie ihn wirklich löschen? (j/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 msgid "Enter the notation: "
 msgstr "Geben Sie die \"Notation\" ein: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 msgid "Proceed? (y/N) "
 msgstr "Fortfahren (j/N)? "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Keine User-ID mit Hash %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Kein Unterschlüssel mit Schlüssel-ID '%s'.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kein Unterschlüssel mit Index %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \"%s\"\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   beglaubigt durch Ihren Schlüssel %s am %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Signatur ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat für diese Signatur erzeugen (j/N)"
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Sie haben folgende User-IDs des Schlüssels %s beglaubigt:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr " (unwiderrufbar)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "widerrufen durch Ihren Schlüssel %s um %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Signatur-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "Versuch eine nicht-User-ID zu widerrufen: %s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "WARNUNG: Eine User-ID-Signatur datiert mit %d Sekunden aus der Zukunft\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Die letzte User-ID kann nicht widerrufen werden!\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Schlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Unterschlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, 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"
@@ -5580,6 +5590,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
 
+#: g10/keygen.c:3102
+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"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5899,54 +5913,54 @@ msgstr "Ungültiges Schlüsselserverprotokoll (wir %d!=Handhabungsroutine %d)\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" ist keine Schlüssel-ID: überspringe\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "%d Schlüssel wird per %s aktualisiert\n"
 msgstr[1] "%d Schlüssel werden per %s aktualisiert\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "WARNUNG: Schlüssel %s kann per %s nicht aktualisiert werden: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "Schlüssel \"%s\" wurde auf dem Schlüsselserver nicht gefunden\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "Schlüssel wurde auf dem Schlüsselserver nicht gefunden\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "fordere Schlüssel %s von %s an\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "Kein Schlüsselserver bekannt\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "übersprungen \"%s\": %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sende Schlüssel %s auf %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "fordere Schlüssel von %s an\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNUNG: die URI %s kann nicht geholt werden: %s\n"
@@ -5976,68 +5990,68 @@ msgstr "Mit unbekanntem Verfahren verschlüsselt %d.%s\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Das Passwort wurde mit unbekanntem Hashverfahren %d erstellt\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr "Öffentlicher Schlüssel ist %s\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "verschlüsselt mit %s Schlüssel, ID %s, erzeugt %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "verschlüsselt mit %s Schlüssel, ID %s\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNUNG: Mehr als ein Klartext erkannt\n"
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Verschlüsselt mit %lu Passwörtern\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "Verschlüsselt mit einem Passwort\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschlüsselung mit Public-Key-Verfahren fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit öffentlichem Schlüssel verschlüsselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "vermutlich %s-verschlüsselte Daten\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA-Verschlüsselung nicht verfügbar; versucht wird stattdessen %s\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 "WARNUNG: Botschaft wurde nicht integritätsgeschützt (integrity protected)\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -6047,184 +6061,184 @@ msgstr ""
 "vermutlich eine legitime Botschaft sein.  Die kann vermutet werden, da\n"
 "vor diesem Zeitpunkt ein Integritätsschutz nur selten verwendet wurde.\n"
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Mit der Option '%s' kann trotzdem entschlüsselt werden.\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "Entschlüsselungs-Fehler erzwungen!\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "Entschlüsselung erfolgreich\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNUNG: Verschlüsselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Entschlüsselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Ursprünglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\", um ihn anzuwenden\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, c-format
 msgid "no signature found\n"
 msgstr "Keine Signatur gefunden\n"
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FALSCHE Signatur von \"%s\""
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verfallene Signatur von \"%s\""
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekte Signatur von \"%s\""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "Signaturüberprüfung unterdrückt\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "diese mehrdeutige Signaturdaten können nicht bearbeitet werden\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur vom %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               mittels %s-Schlüssel %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur vom %s mittels %s Schlüssel ID %s\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               Aussteller \"%s\"\n"
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Schlüssel erhältlich bei: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "Hinweis: Benutze '%s' um diese Information zu verwenden\n"
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[ungewiß]  "
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                    alias \"%s\""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 "WARNUNG: Dieser Schlüssel ist zum Signieren im %s Modus nicht geeignet.\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Diese Signatur ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Diese Signatur verfällt am %s.\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s Signatur, Hashmethode %s%s%s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "Binäre"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "unbekannt"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 msgid ", key algorithm "
 msgstr ", Schlüsselverfahren "
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 "WARNUNG: Keine abgetrennte Signatur; die Datei '%s' wurde NICHT überprüft!\n"
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Signatur kann nicht geprüft werden: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Signatur\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNUNG: Mehrfache Signaturen erkannt.  Es wird nur die erste geprüft.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Signatur der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Signatur nach alter (PGP 2.x) Art\n"
@@ -6298,11 +6312,6 @@ msgstr "(weitere Infos: "
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: mißbilligte Option \"%s\".\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7416,133 +7425,133 @@ msgstr "Lesefehler in `%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "\"Trust-DB\": sync fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "Datei `%s' konnte nicht gesperrt werden\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "'%s' kann nicht gesperrt werden\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "trustdb Transaktion zu groß\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "kann auf `%s' nicht zugreifen: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Fehler beim Erzeugen des Versionsatzes: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ungültige trust-db erzeugt\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trust-db erzeugt\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Hinweis: Die \"trustdb\" ist nicht schreibbar\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ungültige 'Trust'-Datenbank\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hashtable kann nicht erzeugt werden: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Fehler beim Ändern des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: keine trustdb Datei\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: konnte Satz nicht anhängen: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Fehler: Die Vertrauensdatenbank ist fehlerhaft\n"
@@ -8198,16 +8207,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%sNummer: %s%%0ABesitzer: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Verbliebene Versuche: %d"
@@ -8236,10 +8245,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-Callback meldete Fehler: %s\n"
@@ -8259,69 +8268,69 @@ msgstr "PIN ist zu lang; die Maximallänge beträgt %d\n"
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr "PIN hat ungültige Zeichen; es sind nur Ziffern erlaubt\n"
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr "Schlüssel existiert bereits\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "Existierender Schlüssel wird ersetzt werden\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr "neue Schlüssel werden erzeugt\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, c-format
 msgid "writing new key\n"
 msgstr "der neue Schlüssel wird geschrieben\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "Die Antwort enthält das RSA-Modulus nicht\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "Der EC Schlüssel fehlt in der Antwort\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "Schlüsselerzeugung abgeschlossen (%d Sekunde)\n"
 msgstr[1] "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "Die Antwort enthält keine öffentliche Schlüssel-Daten\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 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 "
@@ -8329,55 +8338,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:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Bitte die Admin-PIN eingeben."
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|P|Bitte geben Sie den PIN Entsperrcode (PUK) für den Standard-Schlüssel ein."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Bitte die PIN für den Standard-Schlüssel eingeben."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Der RSA Modulus fehlt oder ist nicht %d Bits lang\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "Der öffentliche Exponent fehlt oder ist zu groß (mehr als %d Bit)\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 msgid "Note: PIN has not yet been enabled."
 msgstr "Tip: Die PIN wurde noch nicht aktiviert."
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "Die Nullpin wurde noch nicht geändert\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Bitte eine neue PIN für den Standard-Schlüssel eingeben."
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|NP|Bitte geben Sie einen neuen PIN Entsperrcode (PUK) für den Standard-"
 "Schlüssel ein."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 "|N|Bitte geben Sie eine neue PIN für den Schlüssel zur Erstellung "
 "qualifizierter Signaturen ein."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8385,7 +8394,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:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8393,27 +8402,27 @@ msgstr ""
 "|N|Bitte geben Sie den PIN Entsperrcode (PUK) für den Schlüssel zur "
 "Erstellung qualifizierter Signaturen ein."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Der Fingerabdruck kann nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
@@ -8421,44 +8430,44 @@ msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNummer: %s%%0ABesitzer: %s%%0AAnzahl: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "Die Standard PIN wird für %s benutzt\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "Die Standard PIN für %s konnte nicht benutzt werden: %s - Die Standard PIN "
 "wird nicht weiter benutzt\n"
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 msgid "||Please unlock the card"
 msgstr "||Bitte entsperren Sie die Karte"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN für CHV%d ist zu kurz; die Mindestlänge beträgt %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "Karte ist dauerhaft gesperrt!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8466,20 +8475,20 @@ msgid_plural ""
 msgstr[0] "Noch %d Admin-PIN-Versuch, bis die Karte dauerhaft gesperrt ist\n"
 msgstr[1] "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft gesperrt ist\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 msgid "||Please enter the PIN"
 msgstr "||Bitte die PIN eingeben"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 msgid "||Please enter the Reset Code for the card"
 msgstr "Bitte geben Sie den Rückstellcode für diese Karte ein"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Der Rückstellcode ist zu kurz; die Mindestlänge beträgt %d\n"
@@ -8487,72 +8496,72 @@ msgstr "Der Rückstellcode ist zu kurz; die Mindestlänge beträgt %d\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr "|RN|Neuer Rückstellcode"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Neue Admin-PIN"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr "|N|Neue PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "|A|Bitte die Admin-PIN sowie die neue Admin-PIN eingeben."
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Bitte die PIN sowie die neue PIN eingeben"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr "Fehler beim Lesen der Anwendungsdaten\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "Erzeugungsdatum fehlt\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Die RSA Primzahl %s fehlt oder ist nicht %d Bits lang\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, c-format
 msgid "unsupported curve\n"
 msgstr "Nicht unterstützte Kurve\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "Der Fingerabdruck auf der Karte entspricht nicht dem angeforderten.\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Die Hashmethode %s wird von der Karte nicht unterstützt\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8560,7 +8569,7 @@ msgstr ""
 "Die Überprüfung der Admin PIN ist momentan durch einen Befehl verboten "
 "worden\n"
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
@@ -8580,7 +8589,7 @@ msgstr "|N|Erstmalige neue PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "Im Multiserver Modus ausführen"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NAME|Die Debugstufe auf NAME setzen"
 
@@ -8624,11 +8633,11 @@ msgstr "|LIST|Anwendungprioritäten auf LIST setzen"
 msgid "deny the use of admin card commands"
 msgstr "Verweigere die Benutzung von \"Admin\"-Befehlen"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Gebrauch: @SCDAEMON@ [Optionen] (-h für Hilfe)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8636,24 +8645,24 @@ msgstr ""
 "Syntax: @SCDAEMON@ [Optionen] [Befehl [Argumente]]\n"
 "Smartcard Daemon für @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "Bitte die Option `--daemon' nutzen, um das Programm im Hintergund "
 "auszuführen\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "Handhabungsroutine für fd %d gestartet\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "Handhabungsroutine für den fd %d beendet\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -8661,7 +8670,7 @@ msgstr "Fehler beim Holen der Schlüsselbenutzungsinformationen: %s\n"
 
 #: sm/call-dirmngr.c:448
 msgid "Tor might be in use - network access is limited"
-msgstr ""
+msgstr "Der Tor Dienst ist aktiv - Zugriff zum Netz ist eingeschränkt"
 
 #: sm/certchain.c:198
 #, c-format
@@ -8888,7 +8897,7 @@ msgstr "Das Wurzelzertifikat ist nicht als vertrauenswürdig markiert"
 msgid "checking the trust list failed: %s\n"
 msgstr "Fehler beim Prüfen der vertrauenswürdigen Zertifikate: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "Der Zertifikatkette ist zu lang\n"
@@ -8946,7 +8955,7 @@ msgstr ""
 "Ein %u-Bit Hashverfahren ist für einen %u-Bit %s Schlüssel nicht möglich\n"
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
@@ -8993,45 +9002,45 @@ msgstr ""
 "gültig von %s bis %s\n"
 "zu entsperren.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 "Schlüsselverwendungszweck nicht vorhanden - für alle Zwecke akzeptiert\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "Das Zertifikat hätte nicht zum Zertifizieren benutzt werden sollen\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 "Das Zertifikat hätte nicht zum Signieren von OCSP Antworten benutzt werden "
 "sollen\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "Das Zertifikat hätte nicht zum Verschlüsseln benutzt werden sollen\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "Das Zertifikat hätte nicht zum Signieren benutzt werden sollen\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "Das Zertifikat kann nicht zum Verschlüsseln benutzt werden\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "Das Zertifikat kann nicht zum Signieren benutzt werden\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "schaue nach einem anderen Zertifikat\n"
@@ -9220,6 +9229,11 @@ msgstr "Ein eigenbeglaubigtes Zertifikat erzeugen? (j/N) "
 msgid "These parameters are used:\n"
 msgstr "Verwendete Parameter:\n"
 
+#: sm/certreqgen-ui.c:433
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr "Das eigenbeglaubigte Zertifikat wird erzeugt.  "
@@ -9292,123 +9306,123 @@ msgstr "Fehler beim Löschen des Zertifikats \"%s\": %s\n"
 msgid "no valid recipients given\n"
 msgstr "Keine gültigen Empfänger angegeben\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "list external keys"
 msgstr "Externe Schlüssel anzeigen"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "list certificate chain"
 msgstr "Schlüssel mit Zertifikatekette anzeigen"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 msgid "import certificates"
 msgstr "Zertifikate importieren"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "export certificates"
 msgstr "Zertifikate exportieren"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr "Smartcard registrieren"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr "Das Kommando an den Dirmngr durchreichen"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr "Rufe das gpg-protect-tool auf"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr "|N|Sende N Zertifikate mit"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr "Eingabedaten sind im PEM Format"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr "Eingabedaten sind im Basis-64 Format"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr "Eingabedaten sind im Binärformat"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 msgid "create base-64 encoded output"
 msgstr "Ausgabe im Basis-64 Format erzeugen"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|USER-ID als voreingestellten Schlüssel benutzen"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|DATEI|DATEI als öffentlichen Schlüsselbund mitbenutzen"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr "Fehlende Zertifikate automatisch holen"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|Benutze die Kodierung NAME für PKCS#12 Passwörter"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr "Niemals eine CRL konsultieren"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr "CRL bei Wurzelzertifikaten nicht überprüfen"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr "Die Gültigkeit mittels OCSP prüfen"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr "Zertifikatsrichtlinien nicht überprüfen"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschlüsselungsverfahren NAME benutzen"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 msgid "|FILE|write an audit log to FILE"
 msgstr "|DATEI|Schreibe ein Audit-Log auf DATEI"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Aufruf: @GPGSM@ [Optionen] [Dateien] (-h für Hilfe)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9417,27 +9431,27 @@ msgstr ""
 "Syntax: @GPGSM@ [Optionen] [Dateien]\n"
 "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME Protokoll\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Hinweis: Verschlüsselung für `%s' wird nicht möglich sein: %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "Unbekanntes Gültigkeitsmodell '%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "Importiere allgemeine Zertifikate: %s\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "Signieren mit `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "Ungültiger Befehl (Es gibt keinen implizierten Befehl)\n"
@@ -9467,7 +9481,7 @@ msgstr "Fehler beim Holen der gespeicherten Flags: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "Fehler beim Importieren des Zertifikats: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "Fehler beim Lesen der Eingabe: %s\n"
@@ -9507,7 +9521,7 @@ msgstr "Problem bei Wiederfinden des Zertifikats: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "Fehler beim Speichern der Flags: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Fehler - "
 
@@ -9898,11 +9912,6 @@ msgstr ""
 msgid "error closing '%s': %s\n"
 msgstr "Fehler beim Schließen von `%s': %s\n"
 
-#: dirmngr/crlcache.c:948
-#, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "Fehler beim Umbenennen von `%s` nach `%s': %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
@@ -10263,10 +10272,8 @@ msgid "reader to file mapping table full - waiting\n"
 msgstr "\"reader to file\" Zuordnungstabelle ist voll - warte\n"
 
 #: dirmngr/crlfetch.c:155
-#, fuzzy
-#| msgid "CRL access not possible due to Tor mode\n"
 msgid "CRL access not possible due to Tor mode"
-msgstr "CRL Zugriff ist im Tor Modus nicht möglich\n"
+msgstr "CRL Zugriff ist im Tor Modus nicht möglich"
 
 #: dirmngr/crlfetch.c:184 dirmngr/crlfetch.c:243 dirmngr/crlfetch.c:277
 #: dirmngr/crlfetch.c:307
@@ -10488,10 +10495,8 @@ msgid "use system's HTTP proxy setting"
 msgstr "Benutze die HTTP Proxy Einstellung des Systems"
 
 #: dirmngr/dirmngr.c:251
-#, fuzzy
-#| msgid "Configuration for HTTP servers"
 msgid "Configuration for OpenPGP servers"
-msgstr "Konfiguration für HTTP Server"
+msgstr "Konfiguration für OpenPGP Server"
 
 #: dirmngr/dirmngr.c:254
 msgid "|URL|use keyserver at URL"
@@ -10502,10 +10507,8 @@ msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|DATEI|Benutze die CA Zertifikate in DATEI für HKP über TLS"
 
 #: dirmngr/dirmngr.c:258
-#, fuzzy
-#| msgid "Configuration for HTTP servers"
 msgid "Configuration for X.509 servers"
-msgstr "Konfiguration für HTTP Server"
+msgstr "Konfiguration für X.509 Server"
 
 #: dirmngr/dirmngr.c:260
 msgid "inhibit the use of LDAP"
@@ -10596,94 +10599,94 @@ msgstr "Gültige Debugebenen sind: %s\n"
 msgid "usage: %s [options] "
 msgstr "Aufruf: %s [Optionen] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "Doppelpunkte sind im Namen des Sockets nicht erlaubt\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "Holen der CRL von `%s' fehlgeschlagen: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "Verarbeitung der CRL von `%s' fehlgeschlagen: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: Zeile ist zu lang - übergangen\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: ungültiger Fingerabdruck erkannt\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: Lesefehler: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: Müll am Ende der Zeile wird ignoriert\n"
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 "SIGHUP empfangen - lese die Konfiguration erneut und lösche die "
 "Zwischenspeicher\n"
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 empfangen - keine Aktion definiert\n"
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM empfangen - wird heruntergefahren ...\n"
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM empfangen - immer noch %d Verbindungen aktiv\n"
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, c-format
 msgid "shutdown forced\n"
 msgstr "Herunterfahren wurde erzwungen\n"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT empfangen - wird sofort heruntergefahren\n"
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "Signal %d empfangen - keine Aktion definiert\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "Fehler beim Zugreifen auf `%s': HTTP Status %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL `%s' nach `%s' umgeleitet (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "zu viele verschachtelte Umleitungen\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "\"Redirection\" geändert auf '%s'\n"
@@ -10799,10 +10802,8 @@ msgid "response from server too large; limit is %d bytes\n"
 msgstr "Antwort vom Server zu lang; die Grenze sind %d Bytes\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 Anfrage ist im Tor Modus nicht möglich\n"
+msgstr "OCSP Anfrage ist im Tor Modus nicht möglich"
 
 #: dirmngr/ocsp.c:157
 #, c-format
@@ -11050,55 +11051,55 @@ msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 "Das Zertifikat hätte nicht zum Signieren einer CRL benutzt werden sollen\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "Reduzierte Informationen"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr "Druckdaten hexkodiert ausgeben"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr "Dekodiere empfangene Datenzeilen"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr "Mit dem Dirmngr verbinden"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "connect to the keyboxd"
 msgstr "Mit dem Keyboxd verbinden"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|Verbinde mit dem Assuan-Socket NAME"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|Verbinde mit dem Assuan-Server an Adresse ADDR"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr "Starten des auf der Kommandozeile angegebenen Assuan-Server"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr "Den \"extended connect\"-Modus nicht nutzen"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|DATEI|Beim Starten Kommandos aus DATEI lesen"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr "Nach dem Starten \"/subst\" ausführen"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Aufruf: @GPG@-connect-agent [Optionen] (-h für Hilfe)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -11106,48 +11107,48 @@ msgstr ""
 "Syntax: @GPG@-connect-agent [Optionen]\n"
 "Mit einem laufenden Agenten verbinden und Befehle senden\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "Option \"%s\" erfordert ein Programm und evtl. Argumente\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "Option \"%s\" wird wegen \"%s\" nicht beachtet\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "Empfangen der Zeile schlug fehl: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "Zeile zu lang - übersprungen\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "Zeile wegen enthaltenem Nul-Zeichen gekürzt\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "unbekannter Befehl `%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "Senden der Zeile schlug fehl: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "Der Keyboxd läuft nicht für diese Session\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "Fehler beim Senden der Standardoptionen: %s\n"
@@ -11207,12 +11208,12 @@ msgstr "Die externe Überprüfung der Komponente %s war nicht erfolgreich"
 msgid "Note that group specifications are ignored\n"
 msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "Fehler beim Schließen von '%s'\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "Fehler beim Hashen von '%s'\n"
@@ -11394,6 +11395,12 @@ msgstr "Verwaltungskommandos für Yubikeys"
 msgid "manage the command history"
 msgstr "Verwaltung der Kommandohistorie"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "Fehler beim Schreiben auf eine temporäre Datei: %s\n"
+
+#~ msgid "run in supervised mode"
+#~ msgstr "Im Supervised Modus ausführen"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
@@ -11555,7 +11562,7 @@ msgstr "Verwaltung der Kommandohistorie"
 
 #, fuzzy
 #~ msgid "Suggest a random passphrase."
-#~ msgstr "Das Passwort ändern"
+#~ msgstr "Ein zufälliges Passwort vorschlagen"
 
 #~ msgid "detected card with S/N: %s\n"
 #~ msgstr "Erkannte Karte hat die Seriennummer: %s\n"
@@ -11743,9 +11750,6 @@ msgstr "Verwaltung der Kommandohistorie"
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "%s kann nicht zum Schreiben geöffnet werden: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "Fehler beim Schreiben von %s: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "Fehler beim Schließen von %s: %s\n"
 
diff --git a/po/el.po b/po/el.po
index af4b674..5782038 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2017-09-14 21:14+0300\n"
 "Last-Translator: Dimitris Maroulidis <dmaroulidis@dimitrismaroulidis.com>\n"
 "Language-Team: team@gnome.gr\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
@@ -29,52 +29,52 @@ msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Σίγου�α θέλετε να διαγ�αφο�ν τα επιλεγμένα κλειδιά; "
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "μη έγκυ�η φ�άση κλειδί"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -85,28 +85,28 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "η φ�άση κλειδί είναι πολ� μεγάλη\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -116,107 +116,107 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί· αυτή είναι μια μυστική π�όταση \n"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "κακή φ�άση κλειδί"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "PIN too long"
 msgstr "η γ�αμμή είναι πολ� μεγάλη\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "η φ�άση κλειδί είναι πολ� μεγάλη\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Μη έγκυ�ος χα�ακτή�ας στο όνομα\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad PIN"
 msgstr "κακό MPI"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "κακή φ�άση κλειδί"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί· αυτή είναι μια μυστική π�όταση \n"
 
-#: agent/command.c:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -228,9 +228,9 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "δεν υποστη�ίζεται ο αλγό�ιθμος π�οστασίας %d%s\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
@@ -238,15 +238,15 @@ msgstr "αδυναμία δημιου�γίας του `%s': %s\n"
 
 #: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -257,137 +257,128 @@ msgstr "αδυναμία π�όσβασης στο `%s': %s\n"
 msgid "no suitable card key found: %s\n"
 msgstr "δε β�έθηκε εγγ�άψιμη μυστική κλειδοθήκη: %s\n"
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2467
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί· αυτή είναι μια μυστική π�όταση \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί· αυτή είναι μια μυστική π�όταση \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: αδυναμία δημιου�γίας hashtable: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Επαναλάβετε τη φ�άση κλειδί: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Επαναλάβετε τη φ�άση κλειδί: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Επαναλάβετε τη φ�άση κλειδί: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "η φ�άση κλειδί δεν επαναλήφθηκε σωστά. Δοκιμάστε ξανά"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "η φ�άση κλειδί δεν επαναλήφθηκε σωστά. Δοκιμάστε ξανά"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "η φ�άση κλειδί δεν επαναλήφθηκε σωστά. Δοκιμάστε ξανά"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
-
-#: agent/genkey.c:150
+#: agent/genkey.c:154
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "εγγ�αφή στο  `%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "αδυναμία εγγ�αφής της κλειδοθήκης `%s': %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Πληκτ�ολογήστε τη φ�άση κλειδί\n"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -395,7 +386,7 @@ msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "Το όνομα π�έπει να έχει τουλάχιστον 5 χα�ακτή�ες\n"
 msgstr[1] "Το όνομα π�έπει να έχει τουλάχιστον 5 χα�ακτή�ες\n"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -403,386 +394,385 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Χ�ήση οπωσδήποτε αυτο� του κλειδιο�; "
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Χ�ειάζεστε μια Φ�άση κλειδί για να π�οστατε�σετε το μυστικό κλειδί.\n"
 "\n"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "Το κλειδί έχει πα�ακαμθεί"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|ΑΡΧΕΙΟ|φό�τωμα του α�θ�ώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "αναλυτικά"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "ήσυχη έξοδος"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "ανανέωση της βάσης δεδομένων εμπιστοσ�νης"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|Ο�ΟΜΑ|καθο�ισμός του σετ χα�ακτή�ων τε�ματικο� σε Ο�ΟΜΑ"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "δεν υποστη�ίζεται"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "δεν υποστη�ίζεται"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|χ�ήση της κατάστασης φ�άσης κλειδί N"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "χ�ήση του gpg-agent"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Αναφέ�ετε τα π�οβλήματα στο <gnupg-bugs@gnu.org>\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Χ�ήση: gpg [επιλογές] [α�χεία] (-h για βοήθεια)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγό�ιθμος πε�ίληψης δεν είναι έγκυ�ος\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "ανάγνωση επιλογών από `%s'\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "αδυναμία δημιου�γίας του %s: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, fuzzy, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδ�ία\n"
 
-#: agent/gpg-agent.c:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, 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:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: κατάλογος δημιου�γήθηκε\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: read απέτυχε (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: αδυναμία δημιου�γίας καταλόγου: %s\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2832
+#: agent/gpg-agent.c:2842
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "η ενημέ�ωση μυστικο� απέτυχε: %s\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: πα�αλείφθηκε: %s\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδ�ία\n"
@@ -808,7 +798,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -818,7 +808,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -872,42 +862,42 @@ msgstr "Ακ��ωση"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "το κλειδί '%s' δε β�έθηκε: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "τμήματα του μυστικο� κλειδιο� δεν είναι διαθέσιμα\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -920,19 +910,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "ναι|ναί"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -945,7 +935,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -955,48 +945,63 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 #, fuzzy
 msgid "Change passphrase"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1231
+#, c-format
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1741
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Σίγου�α θέλετε να διαγ�αφο�ν τα επιλεγμένα κλειδιά; "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 #, fuzzy
 msgid "Delete key"
 msgstr "ενε�γοποιεί ένα κλειδί"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1018,7 +1023,7 @@ msgstr ""
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
@@ -1060,7 +1065,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@ -1122,12 +1127,12 @@ msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία σÏ
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:880
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "η ενημέ�ωση απέτυχε: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
@@ -1355,7 +1360,7 @@ msgid "algorithm: %s"
 msgstr "θω�άκιση: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1526,7 +1531,7 @@ msgstr "θω�άκιση απέτυχε: %s\n"
 msgid "iconv_open failed: %s\n"
 msgstr "αδυναμία π�όσβασης του α�χείου: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
@@ -1565,7 +1570,7 @@ msgstr "το δημόσιο κλειδί %08lX δεν β�έθηκε: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1740,7 +1745,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδ�ία\n"
@@ -1783,7 +1788,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "δημιου�γία ενός πιστοποιητικο� ανάκλησης"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1811,7 +1816,7 @@ msgstr "δεν μποÏ�εί να γίνει αυτό σε κατάσταση δÎ
 msgid "This command is only available for version 2 cards\n"
 msgstr "Αυτή η εντολή απαγο�ε�ετε σε αυτή την κατάσταση %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "τμήματα του μυστικο� κλειδιο� δεν είναι διαθέσιμα\n"
@@ -1878,15 +1883,15 @@ msgstr "κανένα αντίστιχο δημόσιο κλειδί: %s\n"
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
@@ -2234,27 +2239,27 @@ msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Μη έγκυ�η εντολή  (δοκιμάστε \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output δεν λειτου�γεί για αυτή την εντολή\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "αδυναμία π�όσβασης του `%s'\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "το κλειδί '%s' δε β�έθηκε: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 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,8 +2322,8 @@ msgid "subkey"
 msgstr "ΔημοσΚλειδί:"
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "η ενημέ�ωση απέτυχε: %s\n"
@@ -2382,14 +2387,14 @@ msgstr "απαγο�ε�ετε η χ�ήση του κ�υπταλγό�ιθμο
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "απαγο�ε�ετε η χ�ήση του κ�υπταλγό�ιθμου \"%s\" στην κατάσταση %s\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 sm/sign.c:597 sm/verify.c:510
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2414,7 +2419,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2531,12 +2536,12 @@ msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "κλειδί %08lX:  κλειδί τ�που PGP 2.x - πα�αλείφθηκε\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έγινε καμμία εξαγωγή\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, fuzzy, c-format
 #| msgid "error creating `%s': %s\n"
@@ -2606,297 +2611,297 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "χ�ήση του δευτε�ε�οντος κλειδιο� %08lX αντί του π�ωτε�οντος %08lX\n"
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 #, fuzzy
 msgid "make a signature"
 msgstr "δημιου�γία μιας μη π�οσα�τημένης υπογ�αφής"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[α�χείο]|δημιου�γία μιας μη κ�υπτογ�αφημένης υπογ�αφής"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "δημιου�γία μιας μη π�οσα�τημένης υπογ�αφής"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "κ�υπτογ�άφηση δεδομένων"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "κ�υπτογ�άφηση με χ�ήση μόνο συμμετ�ικών αλγο�ίθμων"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "αποκ�υπτογ�άφηση δεδομένων (π�οκαθο�ισμένο)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "επαλήθευση μιας υπογ�αφής"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "απεικόνιση της λίστας κλειδιών"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "απεικόνιση της λίστας κλειδιών και υπογ�αφών"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "έλεγχος υπογ�αφής κλειδιο�"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "απεικόνιση της λίστας κλειδιών και αποτυπωμάτων (fingerprints)"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "απεικόνιση της λίστας μυστικών κλειδιών"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "δημιου�γία ενός πιστοποιητικο� ανάκλησης"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "αφαί�εση των κλειδιών από τη δημόσια κλειδοθήκη"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "αφαί�εση των κλειδιών από τη μυστική κλειδοθήκη"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "υπογ�αφή ενός κλειδιο�"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "υπογ�αφή ενός κλειδιο� τοπικά"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "υπογ�αφή ενός κλειδιο�"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "υπογ�αφή ενός κλειδιο� τοπικά"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "υπογ�αφή ή επεξε�γασία ενός κλειδιο�"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "εξαγωγή κλειδιών"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "εξαγωγή κλειδιών σε ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "εισαγωγή κλειδιών από ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "αναζήτηση κλειδιών σε ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "ανανέωση όλων των κλειδιών από ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "εισαγωγή/συγχώνευση κλειδιών"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "ανανέωση της βάσης δεδομένων εμπιστοσ�νης"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 #, fuzzy
 msgid "print message digests"
 msgstr "|αλγό� [α�χεία]| απεικόνιση πε�ιλήψεων των μηνυμάτων"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|Ο�ΟΜΑ|χ�ήση Ο�ΟΜΑτος σαν π�οκαθο�ισμένο μυστικό κλειδί"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|Ο�ΟΜΑ|κ�υπτογ�άφηση για Ο�ΟΜΑ"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "να μη γίνει καμμία αλλαγή"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "ε�ώτηση π�ιν την επικάλυψη"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "δημιου�γία ascii θω�ακισμένης εξόδου"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|ΑΡΧΕΙΟ|φό�τωμα του α�θ�ώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "χ�ήση κανονικής κατάστασης κειμένου"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|καθο�ισμός επιπέδου συμπίεσης N (0 απενε�γοποιεί)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "εισαγωγή κλειδιών από ένα διακομιστή κλειδιών"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "έλεγχος υπογ�αφής κλειδιο�"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "απεικόνιση της λίστας μυστικών κλειδιών"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|Ο�ΟΜΑ|κ�υπτογ�άφηση για Ο�ΟΜΑ"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "χ�ήση αυτής της ταυτότητας (user id) για υπογ�αφή ή αποκ�υπτογ�άφηση"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2904,7 +2909,7 @@ msgstr ""
 "@\n"
 "(δείτε τη σελίδα man για μια πλή�η λίστα εντολών και επιλογών)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2934,13 +2939,13 @@ msgstr ""
 " --list-keys [ονόματα]        απεικόνιση κλειδιών\n"
 " --fingerprint [ονόματα]      απεικόνιση αποτυπωμάτων (fingerprints)\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Χ�ήση: gpg [επιλογές] [α�χεία] (-h για βοήθεια)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2955,7 +2960,7 @@ msgstr ""
 "υπογ�αφή, έλεγχος, κ�υπτογ�άφηση ή αποκ�υπτογ�άφηση\n"
 "η π�οκαθο�ισμένη λειτου�γία εξα�τάται από τα δεδομένα εισόδου\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2963,578 +2968,578 @@ msgstr ""
 "\n"
 "Υποστη�ιζόμενοι αλγό�ιθμοι:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "ΔημοσΚλειδί:"
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Κ�υπταλγό�ιθμος: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Συμπίεση: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "χ�ήση: gpg [επιλογές] "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "συγκ�ουόμενες εντολές\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "δεν β�έθηκε το σ�μβολο = στον ο�ισμό της ομάδας \"%s\"\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησία στο %s \"%s\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες στο %s \"%s\"\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλής ιδιοκτησίαεσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μη ασφαλείς άδειες εσώκλειστου φακέλου στο %s \"%s\"\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "άγνωστο αντικείμενο �υθμίσεως \"%s\"\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Δεν β�έθηκε αντίστοιχη υπογ�αφή στη μυστική κλειδοθήκη\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Δεν β�έθηκε αντίστοιχη υπογ�αφή στη μυστική κλειδοθήκη\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "το URL πολιτικής υπογ�αφής που δόθηκε δεν είναι έγκυ�ο\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "απεικόνιση της κλειδοθήκης στην οποία αναφέ�ετε το κλειδί"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Δεν β�έθηκε αντίστοιχη υπογ�αφή στη μυστική κλειδοθήκη\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "άγνωστος π�οκαθο�ισμένος πα�αλήπτης `%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Αυτή η εντολή απαγο�ε�ετε σε αυτή την κατάσταση %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "ΣΗΜΕΙΩΣΗ: το %s δεν είναι για κανονική χ�ήση!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Μη έγκυ�η διε�θυνση Email\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "μη έγκυ�ος αλγό�ιθμος  hash `%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "αδυναμία επεξε�γασίας του URI του διακομιση κλειδιών\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "το URL πολιτικής υπογ�αφής που δόθηκε δεν είναι έγκυ�ο\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "αδυναμία ο�ισμο� του exec-path σε %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "μη έγκυ�ες επιλογές ειγαγωγής\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το π�όγ�αμμα ίσως δημιου�γήσει α�χείο core!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το %s πα�ακάμπτει το %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "το %s δεν επιτ�έπεται με το %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "το %s δεν έχει καμμία έννοια μαζί με το %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "εγγ�αφή του μυστικο� κλειδιο� στο `%s'\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγό�ιθμος κ�υπτογ�άφησης δεν είναι έγκυ�ος\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγό�ιθμος πε�ίληψης δεν είναι έγκυ�ος\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "ο επιλεγμένος αλγό�ιθμος κ�υπτογ�άφησης δεν είναι έγκυ�ος\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "ο επιλεγμένος αλγό�ιθμος πε�ίληψης για πιστοποίηση\n"
 "δεν είναι έγκυ�ος\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed π�έπει να είναι μεγαλ�τε�α από 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed π�έπει να είναι μεγαλ�τε�α από 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth π�έπει να είναι μεταξ� 1 και 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "μη έγκυ�ο default-cert-level· π�έπει να είναι 0, 1, 2, ή 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "μη έγκυ�ο min-cert-level· π�έπει να είναι 0, 1, 2, ή 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ΣΗΜΕΙΩΣΗ: η απλή S2K κατάσταση (0) π�έπει να αποφε�γεται\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "μη έγκυ�η κατάσταση S2K; π�έπει να είναι 0, 1 ή 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "μη έγκυ�ες π�οεπιλογές\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "μη έγκυ�ες π�οεπιλογές π�οσωπικο� κ�υπταλγό�ιθμου\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "μη έγκυ�ες π�οεπιλογές π�οσωπικο� κ�υπταλγό�ιθμου\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "μη έγκυ�ες π�οεπιλογές π�οσωπικο� αλγό�ιθμου πε�ίληψης\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "μη έγκυ�ες π�οεπιλογές π�οσωπικο� αλγό�ιθμου συμπίεσης\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "μη έγκυ�ο μέγεθος κλειδιο�, χ�ήση %u bits\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "το %s ακόμα δε λειτου�γεί μαζί με το %s\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "απαγο�ε�ετε η χ�ήση του κ�υπταλγό�ιθμου \"%s\" στην κατάσταση %s\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "απαγο�ε�ετε η χ�ήση του αλγό�ιθμου συμπίεσης \"%s\" στην κατάσταση %s\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δώθηκαν πα�αλήπτες (-r) χώ�ις χ�ήση κ�υπτογ�άφησης\n"
 "δημοσίου κλειδιο�\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "αποκ�υπτογ�άφηση απέτυχε: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "απαγο�ε�ετε η χ�ήση του %s στην κατάσταση %s.\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "απαγο�ε�ετε η χ�ήση του %s στην κατάσταση %s.\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver αποστολή απέτυχε: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver λήψη απέτυχε: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "εξαγωγή κλειδιο� απέτυχε: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "εξαγωγή κλειδιο� απέτυχε: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver αναζήτηση απέτυχε: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver ανανέωση απέτυχε: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "αποθω�άκιση απέτυχε: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "μη έγκυ�ος αλγό�ιθμος  hash `%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Μπο�είτε τώ�α να εισαγάγετε το μήνυμα σας ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "το URL πολιτικής πιστοποιητικο� που δόθηκε δεν είναι έγκυ�ο\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "το URL πολιτικής υπογ�αφής που δόθηκε δεν είναι έγκυ�ο\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "το URL πολιτικής υπογ�αφής που δόθηκε δεν είναι έγκυ�ο\n"
@@ -3548,7 +3553,7 @@ msgstr "εξαγωγή των κλειδιών από αυτή τη κλειδο
 msgid "make timestamp conflicts only a warning"
 msgstr "ο�ισμός των συγκ�ο�σεων ώ�ας (timestamp) μόνο σαν π�οειδοποίηση"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|εγγ�αφή των πλη�οφο�ιών κατάστασης στο FD"
 
@@ -4278,7 +4283,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Σίγου�α θέλετε ακόμα να το υπογ�άψετε; (y/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  Αδυναμία υπογ�αφής.\n"
 
@@ -4481,8 +4486,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Σίγου�α να υπογ�αφεί; "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "η υπογ�αφή απέτυχε: %s\n"
@@ -4699,7 +4704,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "Το κλειδί ανακλήθηκε."
 
@@ -4752,7 +4757,7 @@ msgstr "Σίγου�α θέλετε να διαγ�αφεί αυτό το user I
 msgid "Really move the primary key? (y/N) "
 msgstr "Σίγου�α θέλετε να διαγ�αφεί αυτό το user ID; "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Π�έπει να επιλέξετε τουλάχιστον ένα κλειδί.\n"
@@ -4840,169 +4845,169 @@ msgstr "Αποθήκευση των αλλαγών; "
 msgid "Quit without saving? (y/N) "
 msgstr "Τε�ματισμός χω�ίς αποθήκευση; "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Το κλειδί δεν άλλαξε οπότε δεν χ�ειάζεται ενημέ�ωση.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "Δεν μπο�είτε να διαγ�άψετε το τελευταίο user ID!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "μη έγκυ�η τιμή\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Δεν υπά�χει αυτό το user ID.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Τίποτα για να υπογ�αφεί με το κλειδί  %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   υπογ�άφθηκε από %08lX στις %s%s\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "το %s δεν είναι έγκυ�ο σετ χα�ακτή�ων\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "το κλειδί '%s' δε β�έθηκε: %s\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Πε�ίληψη: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Δυνατότητε: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 #, fuzzy
 msgid "Notations: "
 msgstr "Σημείωση: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Δεν υπά�χουν π�οεπιλογές σε ένα user ID τ�που PGP 2.x.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Αυτό το κλειδί μπο�εί να ανακληθεί από %s κλειδί "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Αυτό το κλειδί μπο�εί να ανακληθεί από %s κλειδί "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (ευαίσθητο)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "αδυναμία δημιου�γίας του %s: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[ανακλημένο]"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [λήγει: %s]"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [λήγει: %s]"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " εμπιστοσ�νη: %c/%c"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " εμπιστοσ�νη: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Αυτό το κλειδί έχει απενε�γοποιηθεί"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5010,19 +5015,19 @@ msgstr ""
 "Η εγγυ�ότητα του απεικονιζόμενου κλειδιο� δεν είναι απα�αίτητα σωστή\n"
 "εκτός και εάν επανακκινήσετε το π�όγ�αμμα.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 #, fuzzy
 msgid "revoked"
 msgstr "[ανακλημένο]"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5031,18 +5036,18 @@ msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν έχει σημειωθεί ID χ�ήστη σαν π�ωτε�ων.  Αυτή η εντολή\n"
 "              μπο�εί να κάνει ένα άλλο ID χ�ήστη να γίνει το π�ωτε�ων.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Δεν μπο�είτε να αλλάξετε την ημε�ομηνία λήξης σε ένα v3 κλειδί\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5051,35 +5056,35 @@ msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό έιναι ένα κλειδί τ�που PGP2. Η π�οσθήκη ενός photo ID\n"
 "               μπο�εί να κάνει με�ικές εκδόσεις PGP να το απο��ίψουν.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Σίγου�α ακόμα θέλετε να το π�οσθέσετε; (y/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Δεν μπο�είτε να π�οσθέσετε μια photo ID σε ένα κλειδί τ�που PGP2.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Διαγ�αφή αυτής της καλής υπογ�αφής; (y/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Διαγ�αφή αυτής της μη έγκυ�ης υπογ�αφής; (y/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Διαγ�αφή αυτής της άγνωστης υπογ�αφής; (y/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Σίγου�α να διαγ�αφεί αυτή η ιδιο-υπογ�αφή; (y/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5087,38 +5092,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Διαγ�άφτηκε %d υπογ�αφή.\n"
 msgstr[1] "Διαγ�άφτηκε %d υπογ�αφή.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Τίποτα δεν διαγ�άφτηκε.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 #, fuzzy
 msgid "invalid"
 msgstr "μη έγκυ�η θω�άκιση"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Το user ID \"%s\" ανακαλείτε."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5128,40 +5133,40 @@ msgstr ""
 "               καθο�ισμένου ανακλητή μπο�εί να κάνει με�ικές εκδόσεις PGP\n"
 "               να το απο��ίψουν.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Δεν μπο�είτε να π�οσθέσετε ένα καθο�ισμένο ανακλητή σε κλειδί τ�που PGP2.x.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Πληκτ�ολογήστε το user ID του διο�ισμένου ανακλητή: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "αδυναμία ο�ισμο� ενός κλειδιο� τ�που PGP 2.x, σαν διο�ισμένου ανακλητή\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "δε μπο�είτε να ο�ίσετε ένα κλειδί σαν το διο�ισμένο ανακλητή του εαυτο� του\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί έχει ανακληθεί από τον ο�ισμένο ανακλητή!\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: εάν ο�ίσετε ένα κλειδί σαν διο�ισμένο ανακλητή δεν μπο�εί να "
 "επανέλθει!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5169,7 +5174,7 @@ msgstr ""
 "Είστε σίγου�οι ότι θέλετε να ο�ίσετε ένα κλειδί σαν διο�ισμένο ανακλητή; (y/"
 "N): "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5178,184 +5183,184 @@ msgstr ""
 "Είστε σίγου�οι ότι θέλετε να ο�ίσετε ένα κλειδί σαν διο�ισμένο ανακλητή; (y/"
 "N): "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Αλλαγή ημε�ομηνίας λήξης για ένα δευτε�ε�ον κλειδί.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Αλλαγή ημε�ομηνίας λήξης για ένα π�ωτε�ον κλειδί.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Δεν μπο�είτε να αλλάξετε την ημε�ομηνία λήξης σε ένα v3 κλειδί\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Αλλαγή ημε�ομηνίας λήξης για ένα δευτε�ε�ον κλειδί.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Αλλαγή ημε�ομηνίας λήξης για ένα π�ωτε�ον κλειδί.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το υπογ�άφων υποκλειδί %08lX δεν έχει κατ' αντιπα�άσταση "
 "πιστοποιηθεί\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Π�έπει να επιλέξετε ακ�ιβώς ένα user ID.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "πα�αλείφθηκε η v3 ιδιο-υπογ�αφή στο user id \"%s\"\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Σίγου�α θέλετε ακόμα να το χ�ησιμοποιήσετε; (y/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Σίγου�α θέλετε ακόμα να το χ�ησιμοποιήσετε; (y/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Σημείωση υπογ�αφής: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Επικάλυψη (y/N); "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Δεν υπά�χει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Δεν υπά�χει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Δεν υπά�χει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Δεν υπά�χει user ID με δείκτη %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   υπογ�άφθηκε από %08lX στις %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (μη-εξαγώγιμο)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Αυτή η υπογ�αφή έληξε στις %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Σίγου�α θέλετε να ανακληθεί αυτό το κλειδί; "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Δημιου�γία ενός πιστοποιητικο� ανάκλησης για αυτή την υπογ�αφή; (y/N)"
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Έχετε υπογ�άψει αυτά τα user ID:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (μη-εξαγώγιμο)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ανακλήθηκε από %08lX στις %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Σκοπε�ετε να ανακαλέσετε αυτές τις υπογ�αφές:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Σίγου�α να δημιου�γηθο�ν τα πιστοποιητικά ανάκλησης; (y/N)"
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "κανένα μυστικό κλειδί\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: μια υπογ�αφή user ID έχει ημε�ομηνία %d δε�τε�α στο μέλλον\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Δεν μπο�είτε να διαγ�άψετε το τελευταίο user ID!\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "το user ID \"%s\" έχει ήδη ανακληθεί\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, 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"
@@ -5783,6 +5788,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Πα�ακαλώ μην τοποθετείτε την διε�θυνση email στο όνομα ή στο σχόλιο\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -6117,56 +6126,56 @@ msgstr "μη έγκυ�ες επιλογές εξαγωγής\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "αίτηση κλειδιο� %08lX από το %s\n"
 msgstr[1] "αίτηση κλειδιο� %08lX από το %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία διαγ�αφής tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "το κλειδί '%s' δε β�έθηκε: %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "το κλειδί '%s' δε β�έθηκε: %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "αίτηση κλειδιο� %08lX από το %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "μη έγκυ�ες επιλογές εξαγωγής\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "πα�αλείφθηκε `%s': %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "υπογ�άφθηκε με το κλειδί σας %08lX στις %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "αίτηση κλειδιο� %08lX από το %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: αδυναμία διαγ�αφής tempfile (%s) `%s': %s\n"
@@ -6199,187 +6208,187 @@ msgstr "κ�υπτογ�αφημένο με άγνωστο αλγό�ιθμο %d
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "κ�υπτογ�αφημένο με άγνωστο αλγό�ιθμο %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "δημόσιο κλειδί είναι %08lX\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "κ�υπτογ�αφημένο με %u-bit %s κλειδί, ID %08lX, δημιου�γήθηκε %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                γνωστό σαν \""
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "κ�υπτογ�αφημένο με %s key, ID %08lX\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "κ�υπτογ�αφημένο με %lu φ�άσεις κλειδιά\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "κ�υπτογ�αφημένο με 1 φ�άση κλειδί\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "κ�υπτογ�άφηση με δημόσιο κλειδί απέτυχε: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "κ�υπτογ�αφημένα δεδομένα με δημόσιο κλειδί: καλό DEK\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "υπόθεση %s κ�υπτογ�αφημένων δεδομένων\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "Κ�υπταλγό�ιθμος IDEA μη διαθέσιμος, αισιόδοξη π�οσπάθεια χ�ήσης του\n"
 "%s αντίθετα\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: δεν π�οστατε�τηκε η ακε�αιότητα του μη�ματος\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "αποκ�υπτογ�άφηση απέτυχε: %s\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "αποκ�υπτογ�άφηση OK\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το κ�υπτογ�αφημένο μήνυμα έχει πει�αχθεί!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "αποκ�υπτογ�άφηση απέτυχε: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "ΣΗΜΕΙΩΣΗ: ο αποστολέας ζήτησε \"για-τα-μάτια-σας-μόνο\"\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "α�χικό όνομα α�χείου='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "ανεξά�τητη ανάκληση - χ�ησιμοποιείστε \"gpg --import\" για εφα�μογή\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Καλή υπογ�αφή από \""
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ΚΑΚΗ υπογ�αφή από \""
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Ληγμένη υπογ�αφή από \""
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Καλή υπογ�αφή από \""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "καταστολή ανάκλησης υπογ�αφής\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "αδυναμία χει�ισμο� αυτών των πολλαπλών υπογ�αφών\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Υπογ�αφή έληξε στις %s.\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                γνωστό σαν \""
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Υπογ�αφή έγινε στο %.*s με χ�ήση του κλειδιο�%s ID %08lX\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                γνωστό σαν \""
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Κλειδί διαθέσιμο στο: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[αβέβαιο]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                γνωστό σαν \""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
@@ -6387,68 +6396,68 @@ msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το κλειδί δεν έχει πιστοποιηθεί με εμπιστε�σιμη "
 "υπογ�αφή!\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Υπογ�αφή έληξε στις %s.\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Υπογ�αφή λήγει στις %s.\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s υπογ�αφή, αλγό�ιθμος πε�ίληψης %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "δυαδικό"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "κατάσταση-κειμένου"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "άγνωστο"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "άγνωστος αλγό�ιθμος δημοσίου κλειδιο�"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Αδυναμία ελέγχου της υπογ�αφής: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "δεν είναι αποκομμένη υπογ�αφή\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: εντοπισμός πολλαπλών υπογ�αφών. Μόνο η π�ώτη θα ελεγχθεί.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "ανεξά�τητη υπογ�αφή κλάσης 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "υπογ�αφή παλιο� στυλ (PGP 2.x)\n"
@@ -6524,11 +6533,6 @@ msgstr ""
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: μη συνειστώμενη επιλογή \"%s\"\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: \"%s\" είναι μια μη συνειστώμενη επιλογή\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7635,134 +7639,134 @@ msgstr "σφάλμα ανάγνωσης: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync απέτυχε: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "αδυναμία δημιου�γίας του `%s': %s\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "αδυναμία π�όσβασης του `%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: αποτυχία lseek: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: αποτυχία write (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "πολ� μεγάλη συναλλαγή trustdb\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ο φάκελος δεν υπά�χει!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "αδυναμία κλεισίματος του `%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: αποτυχία δημιου�γίας μιας εγγ�αφής έκδοσης: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: δημιου�γήθηκε μη έγκυ�η trustdb\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: δημιου�γήθηκε η trustdb\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "ΣΗΜΕΙΩΣΗ: η trustdb δεν είναι εγγ�άψιμη\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: μη έγκυ�η trustdb\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: αδυναμία δημιου�γίας hashtable: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: σφάλμα στην ενημέ�ωση της εγγ�αφής έκδοσης: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: σφάλμα στην ανάγνωση της εγγ�αφής έκδοσης: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: σφάλμα στην εγγ�αφή της εγγ�αφής έκδοσης: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: απέτυχε lseek: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read απέτυχε (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: δεν είναι trustdb α�χείο\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: εγγ�αφή έκδοσης με recnum %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: μη έγκυ�η έκδοση α�χείου %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: σφάλμα στην ανάγνωση της εγγ�αφής free : %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: σφάλμα στην εγγ�αφή της εγγ�αφής dir : %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: αποτυχία στον μηδενισμό μιας εγγ�αφής: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: αποτυχία στην π�οσθήκη μιας εγγ�αφής: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: δημιου�γήθηκε η trustdb\n"
@@ -8387,16 +8391,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8431,10 +8435,10 @@ msgstr "αλλαγή της φ�άσης κλειδί"
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "Πα�ακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8454,158 +8458,158 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' ήδη συμπιέστηκε\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "δημιου�γία ενός νέου ζε�γους κλειδιών"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "αφαί�εση των κλειδιών από τη δημόσια κλειδοθήκη"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "Η δημιου�γία κλειδιο� απέτυχε: %s\n"
 msgstr[1] "Η δημιου�γία κλειδιο� απέτυχε: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Πα�ακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Σημείωση: Αυτό το κλειδί έχει απενε�γοποιηθεί.\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Πα�ακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "αποτυχία α�χικοποίησης της TrustDB: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "αποτυχία επαναδόμησης της cache κλειδοθήκης: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
@@ -8613,43 +8617,43 @@ msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver αποστολή απέτυχε: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8657,22 +8661,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Πα�ακαλώ επιλέξτε την αιτία για την ανάκληση:\n"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8680,81 +8684,81 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "αλλαγή της φ�άσης κλειδί"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "σφάλμα κατά την ανάγνωση του μπλοκ κλειδιών: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: σφάλμα στην ανάγνωση της εγγ�αφής free : %s\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "μη υποστη�ιζόμενο URI"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s υπογ�αφή, αλγό�ιθμος πε�ίληψης %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "δε β�έθηκαν έγκυ�α OpenPGP δεδομένα.\n"
@@ -8775,7 +8779,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8824,33 +8828,33 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "συγκ�ουόμενες εντολές\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Χ�ήση: gpg [επιλογές] [α�χεία] (-h για βοήθεια)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
@@ -9084,7 +9088,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "απέτυχε ο έλεγχος της υπογ�αφής που δημιου�γήθηκε: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
@@ -9139,7 +9143,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -9187,42 +9191,42 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s κλειδί, ID %08lX, δημιου�γία %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "κακό πιστοποιητικό"
@@ -9416,6 +9420,11 @@ msgstr "ΔημιουÏ�γία ενός πιστοποιητικοÏ� ανάκληÏ
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:433
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9488,134 +9497,134 @@ msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Δεν δώθηκε πε�ιγ�αφή)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "list external keys"
 msgstr "απεικόνιση της λίστας μυστικών κλειδιών"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 #, fuzzy
 msgid "list certificate chain"
 msgstr "κακό πιστοποιητικό"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 #, fuzzy
 msgid "import certificates"
 msgstr "κακό πιστοποιητικό"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "export certificates"
 msgstr "κακό πιστοποιητικό"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "μη χ�ήση τε�ματικο�"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "δημιου�γία ascii θω�ακισμένης εξόδου"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|Ο�ΟΜΑ|χ�ήση Ο�ΟΜΑτος σαν π�οκαθο�ισμένο μυστικό κλειδί"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "π�οσθήκη αυτο� του κλειδιο� στη λίστα των κλειδοθηκών"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|Ο�ΟΜΑ|χ�ήση αλγό�ιθμου κ�υπτογ�άφησης Ο�ΟΜΑ για φ�άσεις κλειδιά"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|Ο�ΟΜΑ|χ�ήση αλγό�ιθμου κ�υπτογ�άφησης Ο�ΟΜΑ"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|Ο�ΟΜΑ|χ�ήση αλγό�ιθμου πε�ίληψης μην�ματος Ο�ΟΜΑ "
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "κατάσταση batch: να μη γίνονται ε�ωτήσεις"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "απάντηση ναι στις πε�ισσότε�ες ε�ωτήσεις"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "απάντηση όχι στις πε�ισσότε�ες ε�ωτήσεις"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|ΑΡΧΕΙΟ|φό�τωμα του α�θ�ώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Χ�ήση: gpg [επιλογές] [α�χεία] (-h για βοήθεια)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9626,27 +9635,27 @@ msgstr ""
 "υπογ�αφή, έλεγχος, κ�υπτογ�άφηση ή αποκ�υπτογ�άφηση\n"
 "η π�οκαθο�ισμένη λειτου�γία εξα�τάται από τα δεδομένα εισόδου\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "αδυναμία σ�νδεσης στο `%s': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "άγνωστος π�οκαθο�ισμένος πα�αλήπτης `%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "εγγ�αφή στο  `%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "αδυναμία κλεισίματος του `%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9676,7 +9685,7 @@ msgstr "σφάλμα στη δημιουÏ�γία της φÏ�άσης κλειδÎ
 msgid "error importing certificate: %s\n"
 msgstr "σφάλμα στη δημιου�γία της φ�άσης κλειδί: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@ -9716,7 +9725,7 @@ msgstr "rev? π�όβλημα στον έλεγχο ανάκλησης: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -10085,12 +10094,6 @@ msgstr "αδυναμία δημιου�γίας καταλόγου `%s': %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/crlcache.c:948
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
@@ -10780,93 +10783,93 @@ msgstr ""
 msgid "usage: %s [options] "
 msgstr "χ�ήση: gpg [επιλογές] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "το %s δεν επιτ�έπεται με το %s!\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "θω�άκιση απέτυχε: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "η γ�αμμή είναι πολ� μεγάλη\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "σφάλμα: μη έγκυ�ο αποτ�πωμα\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "σφάλμα ανάγνωσης: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "μη επεξε�γασμένο"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "πά�α πολλές `%c' π�οεπιλογές\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11237,105 +11240,105 @@ msgstr "η π�οεπιλογή %c%lu αντιγ�άφτηκε\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "τε�ματισμός"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|ΑΡΧΕΙΟ|φό�τωμα του α�θ�ώματος επέκτασης ΑΡΧΕΙΟ"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Χ�ήση: gpg [επιλογές] [α�χεία] (-h για βοήθεια)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "διαγ�αφή block κλειδιών απέτυχε: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "η γ�αμμή είναι πολ� μεγάλη\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "άγνωστος π�οκαθο�ισμένος πα�αλήπτης `%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "η υπογ�αφή απέτυχε: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "ο gpg-agent δεν είναι διαθέσιμος σε αυτή τη συνεδ�ία\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "σφάλμα στη αποστολή π�ος το `%s': %s\n"
@@ -11401,12 +11404,12 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
@@ -11596,6 +11599,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "εγγ�αφή στο  `%s'\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "Το κλειδί έχει πα�ακαμθεί"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Το όνομα δεν επιτ�έπεται να ξεκινά με α�ιθμητικό ψηφίο\n"
 
@@ -11857,10 +11869,6 @@ msgstr ""
 #~ msgstr "αδυναμία π�όσβασης του %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "αδυναμία εγγ�αφής της κλειδοθήκης `%s': %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "σφάλμα κατά την ανάγνωση του `%s': %s\n"
 
diff --git a/po/en@boldquot.gmo b/po/en@boldquot.gmo
index 7482e53..842700d 100644
--- a/po/en@boldquot.gmo
+++ b/po/en@boldquot.gmo
diff --git a/po/en@boldquot.po b/po/en@boldquot.po
index 815e292..d48f152 100644
--- a/po/en@boldquot.po
+++ b/po/en@boldquot.po
@@ -30,10 +30,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.3.5\n"
+"Project-Id-Version: GNU gnupg 2.3.7\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-21 16:55+0200\n"
-"PO-Revision-Date: 2022-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
+"PO-Revision-Date: 2022-07-11 12:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en\n"
@@ -42,7 +42,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "failed to acquire the pinentry lock: %s\n"
@@ -53,49 +53,49 @@ msgstr "failed to acquire the pinentry lock: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Cancel"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Yes"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Save in password manager"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Do you really want to make your passphrase visible on the screen?"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Make passphrase visible"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Hide passphrase"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr "Caps Lock is on"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr "Suggest"
 
@@ -106,27 +106,27 @@ msgstr "Suggest"
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr "pinentry.genpin.tooltip"
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr "Note: The blanks are not part of the passphrase."
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 msgid "Passphrase Not Allowed"
 msgstr "Passphrase Not Allowed"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Quality:"
 
@@ -136,11 +136,11 @@ msgstr "Quality:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -148,7 +148,7 @@ msgstr ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -156,76 +156,76 @@ msgstr ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "does not match - try again"
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (try %d of %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr "Repeat:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 msgid "PIN too long"
 msgstr "PIN too long"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 msgid "Passphrase too long"
 msgstr "Passphrase too long"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 msgid "Invalid characters in PIN"
 msgstr "Invalid characters in PIN"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr "PIN too short"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad PIN"
 msgstr "Bad PIN"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad Passphrase"
 msgstr "Bad Passphrase"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr "Note: Request from the web browser."
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr "Note: Request from a remote site."
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Please re-enter this passphrase"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, 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:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -248,24 +248,24 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh keys greater than %d bits are not supported\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, 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
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, 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:2513
+#: agent/command-ssh.c:2467
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "error getting list of cards: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, 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:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Allow"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Deny"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -311,88 +311,79 @@ 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:3708
+#: agent/command-ssh.c:3797
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "failed to create stream from socket: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Please insert the card with serial number"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "Admin PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Reset Code"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr "Push ACK button on card/token."
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr "Use the reader's pinpad for input."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Repeat this Reset Code"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Repeat this PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Repeat this PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Reset Code not correctly repeated; try again"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK not correctly repeated; try again"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN not correctly repeated; try again"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Please enter the PIN%s%s%s to unlock the card"
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "error creating temporary file: %s\n"
-
-#: agent/genkey.c:150
+#: agent/genkey.c:154
 #, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "error writing to temporary file: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "error writing to pipe: %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 msgid "Enter new passphrase"
 msgstr "Enter new passphrase"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -401,18 +392,18 @@ msgstr ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr "Yes, protection is not needed"
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "A passphrase should be at least %u character long."
 msgstr[1] "A passphrase should be at least %u characters long."
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -422,231 +413,227 @@ msgstr[0] ""
 msgstr[1] ""
 "A passphrase should contain at least %u digits or%%0Aspecial characters."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr "A passphrase may not be a known term or match%%0Acertain pattern."
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Warning: You have entered an insecure passphrase."
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 msgid "Take this one anyway"
 msgstr "Take this one anyway"
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Please enter the passphrase to%0Aprotect your new key"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 msgid "Please enter the new passphrase"
 msgstr "Please enter the new passphrase"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 msgid "Options used for startup"
 msgstr "Options used for startup"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr "run in daemon mode (background)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr "run in server mode (foreground)"
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-msgid "run in supervised mode"
-msgstr "run in supervised mode"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr "do not detach from the console"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr "sh-style command output"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr "csh-style command output"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|read options from FILE"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr "Options controlling the diagnostic output"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "verbose"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "be somewhat more quiet"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|write server mode logs to FILE"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr "Options controlling the configuration"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "do not use the SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|use PGM as the SCdaemon program"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|use PGM as the tpm2daemon program"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|accept some commands via NAME"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignore requests to change the TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignore requests to change the X display"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "enable ssh support"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|use ALGO to show ssh fingerprints"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "enable putty support"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 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:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|expire cached PINs after N seconds"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|expire SSH keys after N seconds"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|set maximum PIN cache lifetime to N seconds"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|set maximum SSH key lifetime to N seconds"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr "do not use the PIN cache when signing"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 msgid "disallow the use of an external password cache"
 msgstr "disallow the use of an external password cache"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "disallow clients to mark keys as “trusted�"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 msgid "allow presetting passphrase"
 msgstr "allow presetting passphrase"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr "Options enforcing a passphrase policy"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr "do not allow bypassing the passphrase policy"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|set minimal required length for new passphrases to N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|require at least N non-alpha characters for a new passphrase"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|check new passphrases against pattern in FILE"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|expire the passphrase after N days"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 msgid "do not allow the reuse of old passphrases"
 msgstr "do not allow the reuse of old passphrases"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "Options controlling the PIN-Entry"
 msgstr "Options controlling the PIN-Entry"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 msgid "never use the PIN-entry"
 msgstr "never use the PIN-entry"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr "disallow caller to override the pinentry"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "let PIN-Entry grab keyboard and mouse"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|use PGM as the PIN-Entry program"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|set the Pinentry timeout to N seconds"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "allow passphrase to be prompted through Emacs"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Please report bugs to <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -654,131 +641,136 @@ msgstr ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "invalid debug-level ‘%s’ given\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "reading options from ‘%s’\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNING: “%s� is a deprecated option\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "can't create socket: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket name ‘%s’ is too long\n"
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "trying to steal socket from running %s\n"
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error getting nonce for the socket\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error binding socket to '%s': %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "can't set permissions of '%s': %s\n"
 
-#: agent/gpg-agent.c:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "listening on socket ‘%s’\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "can't create directory '%s': %s\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "directory ‘%s’ created\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() failed for '%s': %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "can't use ‘%s’ as home directory\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error reading nonce on fd %d: %s\n"
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "handler 0x%lx for fd %d started\n"
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "handler 0x%lx for fd %d terminated\n"
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, 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:2832
+#: agent/gpg-agent.c:2842
 #, 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:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect failed: %s - waiting 1s\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stopped\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "no gpg-agent running in this session\n"
@@ -803,7 +795,7 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -813,7 +805,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -869,42 +861,42 @@ msgstr "cancelled\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error while asking for the passphrase: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error opening '%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "file '%s', line %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "statement “%s� ignored in '%s', line %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "system trustlist ‘%s’ not available\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "bad fingerprint in '%s', line %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "invalid keyflag in '%s', line %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "error reading '%s', line %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "error reading list of trusted root certificates\n"
@@ -917,7 +909,7 @@ msgstr "error reading list of trusted root certificates\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -926,11 +918,11 @@ msgstr ""
 "Do you ultimately trust%%0A  “%s�%%0Ato correctly certify user "
 "certificates?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 msgid "Yes"
 msgstr "Yes"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -943,7 +935,7 @@ msgstr "No"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -955,20 +947,25 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr "Correct"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr "Wrong"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "error renaming ‘%s’ to '%s': %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Note: This passphrase has never been changed.%0APlease change it now."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -977,15 +974,24 @@ msgstr ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 msgid "Change passphrase"
 msgstr "Change passphrase"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr "I'll change it later"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr "Please insert the card with serial number"
+
+#: agent/findkey.c:1231
+#, c-format
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+
+#: agent/findkey.c:1741
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -994,11 +1000,11 @@ msgstr ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 msgid "Delete key"
 msgstr "Delete key"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1022,7 +1028,7 @@ msgstr "%s key uses an unsafe (%u bit) hash\n"
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "a %zu bit hash is not valid for a %u bit %s key\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "checking created signature failed: %s\n"
@@ -1061,7 +1067,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "error forking process: %s\n"
@@ -1122,12 +1128,12 @@ 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:905
+#: common/sysutils.c:880
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "waiting for file ‘%s’ to become accessible ...\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "renaming ‘%s’ to ‘%s’ failed: %s\n"
@@ -1341,7 +1347,7 @@ msgid "algorithm: %s"
 msgstr "algorithm: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "unsupported algorithm: %s"
@@ -1496,7 +1502,7 @@ msgstr "conversion from ‘%s’ to ‘%s’ not available\n"
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open failed: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "conversion from ‘%s’ to ‘%s’ failed: %s\n"
@@ -1535,7 +1541,7 @@ msgstr "lock ‘%s’ not made: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "waiting for lock %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s is too old (need %s, have %s)\n"
@@ -1702,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "no dirmngr running in this session\n"
@@ -1741,7 +1747,7 @@ 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:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, c-format
 msgid "Note: %s\n"
 msgstr "Note: %s\n"
@@ -1768,7 +1774,7 @@ msgstr "can't do this in batch mode\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "This command is only available for version 2 cards\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Reset Code not or not anymore available\n"
@@ -1833,14 +1839,14 @@ msgstr "URL to retrieve public key: "
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "error reading '%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
@@ -2168,26 +2174,26 @@ msgstr "Admin commands are not allowed\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Invalid command  (try “help�)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output doesn't work for this command\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "can't open ‘%s’\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "key “%s� not found: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 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,8 +2252,8 @@ msgid "subkey"
 msgstr "subkey"
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "update failed: %s\n"
@@ -2307,14 +2313,14 @@ msgstr "cipher algorithm ‘%s’ may not be used for encryption\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr "(use option “%s� to override)\n"
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "cipher algorithm ‘%s’ may not be used in %s mode\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2336,7 +2342,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "WARNING: key %s is not suitable for encryption in %s mode\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2437,12 +2443,12 @@ msgstr "exporting secret keys not allowed\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "key %s: PGP 2.x style key - skipped\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "WARNING: nothing exported\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, c-format
 msgid "error creating '%s': %s\n"
@@ -2506,268 +2512,268 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "valid values for option '%s':\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 msgid "make a signature"
 msgstr "make a signature"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "make a clear text signature"
 msgstr "make a clear text signature"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "make a detached signature"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "encrypt data"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "encryption only with symmetric cipher"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "decrypt data (default)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "verify a signature"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "list keys"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "list keys and signatures"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr "list and check key signatures"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "list keys and fingerprints"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "list secret keys"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "generate a new key pair"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 msgid "quickly generate a new key pair"
 msgstr "quickly generate a new key pair"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "quickly add a new user-id"
 msgstr "quickly add a new user-id"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 msgid "quickly revoke a user-id"
 msgstr "quickly revoke a user-id"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly set a new expiration date"
 msgstr "quickly set a new expiration date"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr "full featured key pair generation"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "generate a revocation certificate"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "remove keys from the public keyring"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "remove keys from the secret keyring"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "quickly sign a key"
 msgstr "quickly sign a key"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "quickly sign a key locally"
 msgstr "quickly sign a key locally"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 msgid "quickly revoke a key signature"
 msgstr "quickly revoke a key signature"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "sign a key"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "sign a key locally"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "sign or edit a key"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "change a passphrase"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "export keys"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "export keys to a keyserver"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "import keys from a keyserver"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "search for keys on a keyserver"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "update all keys from a keyserver"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "import/merge keys"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr "print the card status"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr "change data on a card"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr "change a card's PIN"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "update the trust database"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid "print message digests"
 msgstr "print message digests"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "run in server mode"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|set the TOFU policy for a key"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|use NAME as default secret key"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 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:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|set up email aliases"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr "use strict OpenPGP behavior"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "do not make any changes"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "prompt before overwriting"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr "Options controlling the input"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr "Options controlling the output"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "create ascii armored output"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|write output to FILE"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "use canonical text mode"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set compress level to N (0 disables)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr "Options controlling key import and export"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 msgid "import missing key from a signature"
 msgstr "import missing key from a signature"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 msgid "include the public key in signatures"
 msgstr "include the public key in signatures"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "disable all access to the dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr "Options controlling key listings"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 msgid "Options to specify keys"
 msgstr "Options to specify keys"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|encrypt for USER-ID"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|use USER-ID to sign or decrypt"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr "Options for unattended use"
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr "Other options"
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2775,7 +2781,7 @@ msgstr ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2795,11 +2801,11 @@ msgstr ""
 " --list-keys [names]        show keys\n"
 " --fingerprint [names]      show fingerprints\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Usage: @GPG@ [options] [files] (-h for help)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2809,7 +2815,7 @@ msgstr ""
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2817,73 +2823,73 @@ msgstr ""
 "\n"
 "Supported algorithms:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "usage: %s [options] %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = sign found in group definition ‘%s’\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe enclosing directory ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2891,19 +2897,19 @@ msgstr ""
 "WARNING: unsafe enclosing directory ownership on configuration file ‘"
 "%s’\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2911,468 +2917,468 @@ msgstr ""
 "WARNING: unsafe enclosing directory permissions on configuration file ‘"
 "%s’\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "unknown configuration item ‘%s’\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr "display photo IDs during key listings"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 msgid "show key usage information during key listings"
 msgstr "show key usage information during key listings"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr "show policy URLs during signature listings"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 msgid "show all notations during signature listings"
 msgstr "show all notations during signature listings"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr "show IETF standard notations during signature listings"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr "show user-supplied notations during signature listings"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "show preferred keyserver URLs during signature listings"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr "show user ID validity during key listings"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr "show revoked and expired user IDs in key listings"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr "show revoked and expired subkeys in key listings"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 msgid "show the keyring name in key listings"
 msgstr "show the keyring name in key listings"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 msgid "show expiration dates during signature listings"
 msgstr "show expiration dates during signature listings"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "unknown TOFU policy ‘%s’\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(use “help� to list choices)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "This command is not allowed while in %s mode.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Note: %s is not for normal use!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’ is not a valid signature expiration\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s� is not a proper mail address\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "invalid pinentry mode ‘%s’\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "invalid request origin ‘%s’\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’ is not a valid character set\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "could not parse keyserver URL\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: invalid keyserver options\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "invalid keyserver options\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "invalid filter option: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr "display photo IDs during signature verification"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr "show policy URLs during signature verification"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 msgid "show all notations during signature verification"
 msgstr "show all notations during signature verification"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr "show IETF standard notations during signature verification"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr "show user-supplied notations during signature verification"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "show preferred keyserver URLs during signature verification"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 msgid "show user ID validity during signature verification"
 msgstr "show user ID validity during signature verification"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "show revoked and expired user IDs in signature verification"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 msgid "show only the primary user ID in signature verification"
 msgstr "show only the primary user ID in signature verification"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "invalid argument for option “%.50s�\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNING: running with faked system time: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "will not run with insecure memory due to %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, c-format
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "selected AEAD algorithm is invalid\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth must be in the range from 1 to 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "invalid S2K mode; must be 0, 1 or 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, c-format
 msgid "invalid personal AEAD preferences\n"
 msgstr "invalid personal AEAD preferences\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "chunk size invalid - using %d\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "AEAD algorithm ‘%s’ may not be used in %s mode\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "compression algorithm ‘%s’ may not be used in %s mode\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "WARNING: recipients (-r) given without using public key encryption\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "you cannot use --symmetric --encrypt in %s mode\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "you cannot use --symmetric --sign --encrypt in %s mode\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export as ssh key failed: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "invalid hash algorithm ‘%s’\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "error parsing key specification '%s': %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 "‘%s’ does not appear to be a valid key ID, fingerprint or keygrip\n"
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "the given preferred keyserver URL is invalid\n"
@@ -3385,7 +3391,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|write status info to this FD"
 
@@ -4096,7 +4102,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Are you sure you still want to sign it? (y/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  Unable to sign.\n"
 
@@ -4271,8 +4277,8 @@ msgstr "I have checked this key very carefully.\n"
 msgid "Really sign? (y/N) "
 msgstr "Really sign? (y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signing failed: %s\n"
@@ -4467,7 +4473,7 @@ msgstr ""
 "signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "Key is revoked."
 
@@ -4515,7 +4521,7 @@ msgstr "Really remove this user ID? (y/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Really move the primary key? (y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr "You must select exactly one key.\n"
 
@@ -4590,161 +4596,161 @@ msgstr "Save changes? (y/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Quit without saving? (y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Key not changed so no update needed.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "revoking the user ID failed: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "setting the primary user ID failed: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "“%s� is not a fingerprint\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "“%s� is not the primary fingerprint\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Invalid user ID '%s': %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "No matching user IDs."
 msgstr "No matching user IDs."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "Nothing to sign.\n"
 msgstr "Nothing to sign.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Not signed by you.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "revoking the key signature failed: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "‘%s’ is not a valid expiration time\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "“%s� is not a proper fingerprint\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "subkey “%s� not found\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr "AEAD: "
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Features: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr "Preferred keyserver: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 msgid "Notations: "
 msgstr "Notations: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "There are no preferences on a PGP 2.x-style user ID.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "The following key was revoked on %s by %s key %s\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "This key may be revoked by %s key %s"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr "(sensitive)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "created: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr "revoked: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr "expired: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "expires: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr "usage: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr "card-no: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr "trust: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr "validity: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "This key has been disabled"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4752,17 +4758,17 @@ msgstr ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr "revoked"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "expired"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4771,17 +4777,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:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "WARNING: Your encryption subkey expires soon.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "You may want to change its expiration date too.\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4791,72 +4797,72 @@ msgstr ""
 "versions\n"
 "         of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Are you sure you still want to add it? (y/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "You may not add a photo ID to a PGP2-style key.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
-msgstr "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+msgid "Such a user ID already exists on this key!"
+msgstr "Such a user ID already exists on this key!"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Delete this good signature? (y/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Delete this invalid signature? (y/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Delete this unknown signature? (y/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Really delete this self-signature? (y/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, 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:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Nothing deleted.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "invalid"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID “%s� compacted: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID “%s�: already minimized\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID “%s�: already clean\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4866,40 +4872,40 @@ msgstr ""
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Enter the user ID of the designated revoker: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "you cannot appoint a key as its own designated revoker\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "this key has already been designated as a revoker\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -4907,171 +4913,171 @@ msgstr ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changing expiration time for a subkey.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changing expiration time for the primary key.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "You can't change the expiration date of a v3 key\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 msgid "Changing usage of a subkey.\n"
 msgstr "Changing usage of a subkey.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 msgid "Changing usage of the primary key.\n"
 msgstr "Changing usage of the primary key.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signing subkey %s is already cross-certified\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "subkey %s does not sign and so does not need to be cross-certified\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Please select exactly one user ID.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "skipping v3 self-signature on user ID “%s�\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr "Enter your preferred keyserver URL: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Are you sure you want to replace it? (y/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Are you sure you want to delete it? (y/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 msgid "Enter the notation: "
 msgstr "Enter the notation: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 msgid "Proceed? (y/N) "
 msgstr "Proceed? (y/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No user ID with index %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No user ID with hash %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No subkey with key ID '%s'.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No subkey with index %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: “%s�\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "signed by your key %s on %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "This signature expired on %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Are you sure you still want to revoke it? (y/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Create a revocation certificate for this signature? (y/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "You have signed these user IDs on key %s:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr " (non-revocable)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revoked by your key %s on %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "You are about to revoke these signatures:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Really create the revocation certificates? (y/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "no secret key\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "tried to revoke a non-user ID: %s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "user ID “%s� is already revoked\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "WARNING: a user ID signature is dated %d seconds in the future\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Key %s is already revoked.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subkey %s is already revoked.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, 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"
@@ -5483,6 +5489,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Please don't put the email address into the real name or the comment\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Such a user ID already exists on this key!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5798,54 +5808,54 @@ msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s� not a key ID: skipping\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "refreshing %d key from %s\n"
 msgstr[1] "refreshing %d keys from %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "WARNING: unable to refresh key %s via %s: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "key “%s� not found on keyserver\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "key not found on keyserver\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requesting key %s from %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "no keyserver known\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "skipped “%s�: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sending key %s to %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "requesting key from ‘%s’\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNING: unable to fetch URI %s: %s\n"
@@ -5875,67 +5885,67 @@ msgstr "encrypted with unknown algorithm %d.%s\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passphrase generated with unknown digest algorithm %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr "public key is %s\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "encrypted with %s key, ID %s, created %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s�\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "encrypted with %s key, ID %s\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNING: multiple plaintexts seen\n"
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "encrypted with %lu passphrases\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "encrypted with 1 passphrase\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "public key decryption failed: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "public key encrypted data: good DEK\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "assuming %s encrypted data\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "WARNING: message was not integrity protected\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -5945,179 +5955,179 @@ msgstr ""
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Use the option ‘%s’ to decrypt anyway.\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "decryption forced to fail!\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "decryption okay\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNING: encrypted message has been manipulated!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decryption failed: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Note: sender requested “for-your-eyes-only�\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "standalone revocation - use “gpg --import� to apply\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, c-format
 msgid "no signature found\n"
 msgstr "no signature found\n"
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "BAD signature from “%s�"
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Expired signature from “%s�"
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Good signature from “%s�"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signature verification suppressed\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "can't handle this ambiguous signature data\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature made %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               using %s key %s\n"
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature made %s using %s key ID %s\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               issuer “%s�\n"
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Key available at: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "Note: Use ‘%s’ to make use of this info\n"
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka “%s�"
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "WARNING: This key is not suitable for signing in %s mode\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature expired %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature expires %s\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s signature, digest algorithm %s%s%s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "binary"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "textmode"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "unknown"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 msgid ", key algorithm "
 msgstr ", key algorithm "
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "WARNING: not a detached signature; file ‘%s’ was NOT verified!\n"
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Can't check signature: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "not a detached signature\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "standalone signature of class 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "old style (PGP 2.x) signature\n"
@@ -6187,11 +6197,6 @@ msgstr "(further info: "
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: deprecated option “%s�\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "WARNING: “%s� is a deprecated option\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7238,133 +7243,133 @@ msgstr "read error in '%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync failed: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "can't create lock for ‘%s’\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "can't lock ‘%s’\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek failed: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "trustdb transaction too large\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: directory does not exist!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "can't access '%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: failed to create version record: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: invalid trustdb created\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb created\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Note: trustdb not writable\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: invalid trustdb\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: failed to create hashtable: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error updating version record: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error reading version record: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error writing version record: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek failed: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: not a trustdb file\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error reading free record: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error writing dir record: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: failed to zero a record: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: failed to append a record: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Error: The trustdb is corrupted.\n"
@@ -7982,16 +7987,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%sNumber: %s%%0AHolder: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Remaining attempts: %d"
@@ -8020,10 +8025,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN callback returned error: %s\n"
@@ -8043,119 +8048,119 @@ msgstr "PIN is too long; maximum length is %d\n"
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr "PIN has invalid characters; only digits are allowed\n"
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr "key already exists\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "existing key will be replaced\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr "generating new key\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, c-format
 msgid "writing new key\n"
 msgstr "writing new key\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "failed to store the key: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "response does not contain the RSA modulus\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "response does not contain the RSA public exponent\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "response does not contain the EC public key\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "please wait while key is being generated ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr "generating key failed\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "key generation completed (%d second)\n"
 msgstr[1] "key generation completed (%d seconds)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "response does not contain the public key data\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||Please enter the PIN for the key to create qualified signatures."
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Please enter the Admin PIN"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Please enter the PIN for the standard keys."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modulus missing or not of size %d bits\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA public exponent missing or larger than %d bits\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 msgid "Note: PIN has not yet been enabled."
 msgstr "Note: PIN has not yet been enabled."
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "the NullPIN has not yet been changed\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Please enter a new PIN for the standard keys."
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|Please enter a new PIN for the key to create qualified signatures."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8163,7 +8168,7 @@ msgstr ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8171,27 +8176,27 @@ msgstr ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error getting new PIN: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "failed to store the fingerprint: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "failed to store the creation date: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "error retrieving CHV status from card\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "reading public key failed: %s\n"
@@ -8199,42 +8204,42 @@ msgstr "reading public key failed: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "using default PIN as %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr "failed to use default PIN as %s: %s - disabling further default use\n"
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 msgid "||Please unlock the card"
 msgstr "||Please unlock the card"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN for CHV%d is too short; minimum length is %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verify CHV%d failed: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "card is permanently locked!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8242,20 +8247,20 @@ msgid_plural ""
 msgstr[0] "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgstr[1] "%d Admin PIN attempts remaining before card is permanently locked\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "access to admin commands is not configured\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 msgid "||Please enter the PIN"
 msgstr "||Please enter the PIN"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Please enter the Reset Code for the card"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Reset Code is too short; minimum length is %d\n"
@@ -8263,79 +8268,79 @@ msgstr "Reset Code is too short; minimum length is %d\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr "|RN|New Reset Code"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr "|AN|New Admin PIN"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr "|N|New PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Please enter the Admin PIN and New Admin PIN"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Please enter the PIN and New PIN"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr "error reading application data\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "error reading fingerprint DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "creation timestamp missing\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA prime %s missing or not of size %d bits\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, c-format
 msgid "unsupported curve\n"
 msgstr "unsupported curve\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "fingerprint on card does not match requested one\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "card does not support digest algorithm %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures created so far: %lu\n"
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "verification of Admin PIN is currently prohibited through this command\n"
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "can't access %s - invalid OpenPGP card?\n"
@@ -8355,7 +8360,7 @@ msgstr "|N|Initial New PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "run in multi server mode (foreground)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|set the debugging level to LEVEL"
 
@@ -8399,11 +8404,11 @@ msgstr "|LIST|change the application priority to LIST"
 msgid "deny the use of admin card commands"
 msgstr "deny the use of admin card commands"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8411,23 +8416,23 @@ msgstr ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "please use the option ‘--daemon’ to run the program in the background\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "handler for fd %d started\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "handler for fd %d terminated\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -8653,7 +8658,7 @@ msgstr "root certificate is not marked trusted"
 msgid "checking the trust list failed: %s\n"
 msgstr "checking the trust list failed: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certificate chain too long\n"
@@ -8708,7 +8713,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "a %u bit hash is not valid for a %u bit %s key\n"
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
@@ -8754,42 +8759,42 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "no key usage specified - assuming all usages\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "certificate should not have been used for certification\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certificate should not have been used for OCSP response signing\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certificate should not have been used for encryption\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certificate should not have been used for signing\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certificate is not usable for encryption\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certificate is not usable for signing\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "looking for another certificate\n"
@@ -8977,6 +8982,11 @@ msgstr "Create self-signed certificate? (y/N) "
 msgid "These parameters are used:\n"
 msgstr "These parameters are used:\n"
 
+#: sm/certreqgen-ui.c:433
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "error creating temporary file: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr "Now creating self-signed certificate.  "
@@ -9047,123 +9057,123 @@ msgstr "deleting certificate “%s� failed: %s\n"
 msgid "no valid recipients given\n"
 msgstr "no valid recipients given\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "list external keys"
 msgstr "list external keys"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "list certificate chain"
 msgstr "list certificate chain"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 msgid "import certificates"
 msgstr "import certificates"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "export certificates"
 msgstr "export certificates"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr "register a smartcard"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr "pass a command to the dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr "invoke gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "don't use the terminal at all"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr "|N|number of certificates to include"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|take policy information from FILE"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr "assume input is in PEM format"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr "assume input is in base-64 format"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr "assume input is in binary format"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 msgid "create base-64 encoded output"
 msgstr "create base-64 encoded output"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|use USER-ID as default secret key"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|add keyring to the list of keyrings"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr "fetch missing issuer certificates"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr "never consult a CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr "do not check CRLs for root certificates"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr "check validity using OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr "do not check certificate policies"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|use cipher algorithm NAME"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|use message digest algorithm NAME"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "batch mode: never ask"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "assume yes on most questions"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "assume no on most questions"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|write an audit log to FILE"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9173,27 +9183,27 @@ msgstr ""
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 "Default operation depends on the input data\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Note: won't be able to encrypt to '%s': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "unknown validation model ‘%s’\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importing common certificates ‘%s’\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "can't sign using '%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "invalid command (there is no implicit command)\n"
@@ -9223,7 +9233,7 @@ msgstr "error getting stored flags: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "error importing certificate: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "error reading input: %s\n"
@@ -9263,7 +9273,7 @@ msgstr "problem re-searching certificate: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "error storing flags: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Error - "
 
@@ -9634,11 +9644,6 @@ msgstr "failed to create temporary cache dir file '%s': %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "error closing '%s': %s\n"
 
-#: dirmngr/crlcache.c:948
-#, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "error renaming ‘%s’ to '%s': %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
@@ -10306,92 +10311,92 @@ msgstr "valid debug levels are: %s\n"
 msgid "usage: %s [options] "
 msgstr "usage: %s [options] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "colons are not allowed in the socket name\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fetching CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "processing CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: line too long - skipped\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: invalid fingerprint detected\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: read error: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: garbage at end of line ignored\n"
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 received - no action defined\n"
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM received - shutting down ...\n"
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM received - still %d active connections\n"
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, c-format
 msgid "shutdown forced\n"
 msgstr "shutdown forced\n"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT received - immediate shutdown\n"
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d received - no action defined\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "error accessing '%s': http status %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL ‘%s’ redirected to ‘%s’ (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "too many redirections\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "redirection changed to ‘%s’\n"
@@ -10752,55 +10757,55 @@ msgstr "certificate chain is good\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certificate should not have been used for CRL signing\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "quiet"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr "print data out hex encoded"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr "decode received data lines"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr "connect to the dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "connect to the keyboxd"
 msgstr "connect to the keyboxd"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|connect to Assuan socket NAME"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|connect to Assuan server at ADDR"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr "run the Assuan server given on the command line"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr "do not use extended connect mode"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|run commands from FILE on startup"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr "run /subst on startup"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Usage: @GPG@-connect-agent [options] (-h for help)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -10808,48 +10813,48 @@ msgstr ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "option “%s� requires a program and optional arguments\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "option “%s� ignored due to “%s�\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "receiving line failed: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "line too long - skipped\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "line shortened due to embedded Nul character\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "unknown command ‘%s’\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "sending line failed: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "no keybox daemon running in this session\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error sending standard options: %s\n"
@@ -10909,12 +10914,12 @@ msgstr "External verification of component %s failed"
 msgid "Note that group specifications are ignored\n"
 msgstr "Note that group specifications are ignored\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "error closing ‘%s’\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "error parsing ‘%s’\n"
diff --git a/po/en@quot.gmo b/po/en@quot.gmo
index 5b1b937..6a16b13 100644
--- a/po/en@quot.gmo
+++ b/po/en@quot.gmo
diff --git a/po/en@quot.po b/po/en@quot.po
index fbaac42..99b1b18 100644
--- a/po/en@quot.po
+++ b/po/en@quot.po
@@ -27,10 +27,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.3.5\n"
+"Project-Id-Version: GNU gnupg 2.3.7\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-21 16:55+0200\n"
-"PO-Revision-Date: 2022-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
+"PO-Revision-Date: 2022-07-11 12:31+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
 "Language: en\n"
@@ -39,7 +39,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "failed to acquire the pinentry lock: %s\n"
@@ -50,49 +50,49 @@ msgstr "failed to acquire the pinentry lock: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Cancel"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Yes"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Save in password manager"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Do you really want to make your passphrase visible on the screen?"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Make passphrase visible"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Hide passphrase"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr "Caps Lock is on"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr "Suggest"
 
@@ -103,27 +103,27 @@ msgstr "Suggest"
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr "pinentry.genpin.tooltip"
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr "Note: The blanks are not part of the passphrase."
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 msgid "Passphrase Not Allowed"
 msgstr "Passphrase Not Allowed"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Quality:"
 
@@ -133,11 +133,11 @@ msgstr "Quality:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -145,7 +145,7 @@ msgstr ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -153,76 +153,76 @@ msgstr ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "does not match - try again"
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (try %d of %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr "Repeat:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 msgid "PIN too long"
 msgstr "PIN too long"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 msgid "Passphrase too long"
 msgstr "Passphrase too long"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 msgid "Invalid characters in PIN"
 msgstr "Invalid characters in PIN"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr "PIN too short"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad PIN"
 msgstr "Bad PIN"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad Passphrase"
 msgstr "Bad Passphrase"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr "Note: Request from the web browser."
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr "Note: Request from a remote site."
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Please re-enter this passphrase"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, 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:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -245,24 +245,24 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh keys greater than %d bits are not supported\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, 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
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, 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:2513
+#: agent/command-ssh.c:2467
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "error getting list of cards: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, 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:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Allow"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Deny"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -308,88 +308,79 @@ 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:3708
+#: agent/command-ssh.c:3797
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "failed to create stream from socket: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Please insert the card with serial number"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "Admin PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Reset Code"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr "Push ACK button on card/token."
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr "Use the reader's pinpad for input."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Repeat this Reset Code"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Repeat this PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Repeat this PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Reset Code not correctly repeated; try again"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK not correctly repeated; try again"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN not correctly repeated; try again"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Please enter the PIN%s%s%s to unlock the card"
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "error creating temporary file: %s\n"
-
-#: agent/genkey.c:150
+#: agent/genkey.c:154
 #, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "error writing to temporary file: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "error writing to pipe: %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 msgid "Enter new passphrase"
 msgstr "Enter new passphrase"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -398,18 +389,18 @@ msgstr ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr "Yes, protection is not needed"
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "A passphrase should be at least %u character long."
 msgstr[1] "A passphrase should be at least %u characters long."
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -419,231 +410,227 @@ msgstr[0] ""
 msgstr[1] ""
 "A passphrase should contain at least %u digits or%%0Aspecial characters."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr "A passphrase may not be a known term or match%%0Acertain pattern."
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Warning: You have entered an insecure passphrase."
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 msgid "Take this one anyway"
 msgstr "Take this one anyway"
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Please enter the passphrase to%0Aprotect your new key"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 msgid "Please enter the new passphrase"
 msgstr "Please enter the new passphrase"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 msgid "Options used for startup"
 msgstr "Options used for startup"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr "run in daemon mode (background)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr "run in server mode (foreground)"
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-msgid "run in supervised mode"
-msgstr "run in supervised mode"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr "do not detach from the console"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr "sh-style command output"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr "csh-style command output"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|read options from FILE"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr "Options controlling the diagnostic output"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "verbose"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "be somewhat more quiet"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|write server mode logs to FILE"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr "Options controlling the configuration"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "do not use the SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|use PGM as the SCdaemon program"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|use PGM as the tpm2daemon program"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|accept some commands via NAME"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignore requests to change the TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignore requests to change the X display"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "enable ssh support"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|use ALGO to show ssh fingerprints"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "enable putty support"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 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:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|expire cached PINs after N seconds"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|expire SSH keys after N seconds"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|set maximum PIN cache lifetime to N seconds"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|set maximum SSH key lifetime to N seconds"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr "do not use the PIN cache when signing"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 msgid "disallow the use of an external password cache"
 msgstr "disallow the use of an external password cache"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "disallow clients to mark keys as “trusted�"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 msgid "allow presetting passphrase"
 msgstr "allow presetting passphrase"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr "Options enforcing a passphrase policy"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr "do not allow bypassing the passphrase policy"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|set minimal required length for new passphrases to N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|require at least N non-alpha characters for a new passphrase"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|check new passphrases against pattern in FILE"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|expire the passphrase after N days"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 msgid "do not allow the reuse of old passphrases"
 msgstr "do not allow the reuse of old passphrases"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "Options controlling the PIN-Entry"
 msgstr "Options controlling the PIN-Entry"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 msgid "never use the PIN-entry"
 msgstr "never use the PIN-entry"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr "disallow caller to override the pinentry"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "let PIN-Entry grab keyboard and mouse"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|use PGM as the PIN-Entry program"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|set the Pinentry timeout to N seconds"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "allow passphrase to be prompted through Emacs"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Please report bugs to <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Usage: @GPG_AGENT@ [options] (-h for help)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -651,131 +638,136 @@ msgstr ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "invalid debug-level ‘%s’ given\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "selected digest algorithm is invalid\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "reading options from ‘%s’\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNING: “%s� is a deprecated option\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "can't create socket: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket name ‘%s’ is too long\n"
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "trying to steal socket from running %s\n"
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error getting nonce for the socket\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error binding socket to '%s': %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "can't set permissions of '%s': %s\n"
 
-#: agent/gpg-agent.c:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "listening on socket ‘%s’\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "can't create directory '%s': %s\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "directory ‘%s’ created\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() failed for '%s': %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "can't use ‘%s’ as home directory\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error reading nonce on fd %d: %s\n"
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "handler 0x%lx for fd %d started\n"
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "handler 0x%lx for fd %d terminated\n"
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, 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:2832
+#: agent/gpg-agent.c:2842
 #, 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:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect failed: %s - waiting 1s\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stopped\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "no gpg-agent running in this session\n"
@@ -800,7 +792,7 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -810,7 +802,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -866,42 +858,42 @@ msgstr "cancelled\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error while asking for the passphrase: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error opening '%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "file '%s', line %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "statement “%s� ignored in '%s', line %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "system trustlist ‘%s’ not available\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "bad fingerprint in '%s', line %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "invalid keyflag in '%s', line %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "error reading '%s', line %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "error reading list of trusted root certificates\n"
@@ -914,7 +906,7 @@ msgstr "error reading list of trusted root certificates\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -922,11 +914,11 @@ msgid ""
 msgstr ""
 "Do you ultimately trust%%0A  “%s�%%0Ato correctly certify user certificates?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 msgid "Yes"
 msgstr "Yes"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -939,7 +931,7 @@ msgstr "No"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -951,20 +943,25 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr "Correct"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr "Wrong"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "error renaming ‘%s’ to '%s': %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Note: This passphrase has never been changed.%0APlease change it now."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -973,15 +970,24 @@ msgstr ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 msgid "Change passphrase"
 msgstr "Change passphrase"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr "I'll change it later"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr "Please insert the card with serial number"
+
+#: agent/findkey.c:1231
+#, c-format
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+
+#: agent/findkey.c:1741
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -990,11 +996,11 @@ msgstr ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 msgid "Delete key"
 msgstr "Delete key"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1018,7 +1024,7 @@ msgstr "%s key uses an unsafe (%u bit) hash\n"
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "a %zu bit hash is not valid for a %u bit %s key\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "checking created signature failed: %s\n"
@@ -1057,7 +1063,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "error forking process: %s\n"
@@ -1118,12 +1124,12 @@ 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:905
+#: common/sysutils.c:880
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "waiting for file ‘%s’ to become accessible ...\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "renaming ‘%s’ to ‘%s’ failed: %s\n"
@@ -1337,7 +1343,7 @@ msgid "algorithm: %s"
 msgstr "algorithm: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "unsupported algorithm: %s"
@@ -1492,7 +1498,7 @@ msgstr "conversion from ‘%s’ to ‘%s’ not available\n"
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open failed: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "conversion from ‘%s’ to ‘%s’ failed: %s\n"
@@ -1531,7 +1537,7 @@ msgstr "lock ‘%s’ not made: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "waiting for lock %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s is too old (need %s, have %s)\n"
@@ -1698,7 +1704,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "no dirmngr running in this session\n"
@@ -1736,7 +1742,7 @@ 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:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, c-format
 msgid "Note: %s\n"
 msgstr "Note: %s\n"
@@ -1763,7 +1769,7 @@ msgstr "can't do this in batch mode\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "This command is only available for version 2 cards\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Reset Code not or not anymore available\n"
@@ -1828,14 +1834,14 @@ msgstr "URL to retrieve public key: "
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "error reading '%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
@@ -2163,26 +2169,26 @@ msgstr "Admin commands are not allowed\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Invalid command  (try “help�)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output doesn't work for this command\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "can't open ‘%s’\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "key “%s� not found: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2241,8 +2247,8 @@ msgid "subkey"
 msgstr "subkey"
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "update failed: %s\n"
@@ -2302,14 +2308,14 @@ msgstr "cipher algorithm ‘%s’ may not be used for encryption\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr "(use option “%s� to override)\n"
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "cipher algorithm ‘%s’ may not be used in %s mode\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2331,7 +2337,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "WARNING: key %s is not suitable for encryption in %s mode\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2432,12 +2438,12 @@ msgstr "exporting secret keys not allowed\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "key %s: PGP 2.x style key - skipped\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "WARNING: nothing exported\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, c-format
 msgid "error creating '%s': %s\n"
@@ -2501,268 +2507,268 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "valid values for option '%s':\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 msgid "make a signature"
 msgstr "make a signature"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "make a clear text signature"
 msgstr "make a clear text signature"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "make a detached signature"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "encrypt data"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "encryption only with symmetric cipher"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "decrypt data (default)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "verify a signature"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "list keys"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "list keys and signatures"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr "list and check key signatures"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "list keys and fingerprints"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "list secret keys"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "generate a new key pair"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 msgid "quickly generate a new key pair"
 msgstr "quickly generate a new key pair"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "quickly add a new user-id"
 msgstr "quickly add a new user-id"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 msgid "quickly revoke a user-id"
 msgstr "quickly revoke a user-id"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly set a new expiration date"
 msgstr "quickly set a new expiration date"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr "full featured key pair generation"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "generate a revocation certificate"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "remove keys from the public keyring"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "remove keys from the secret keyring"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "quickly sign a key"
 msgstr "quickly sign a key"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "quickly sign a key locally"
 msgstr "quickly sign a key locally"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 msgid "quickly revoke a key signature"
 msgstr "quickly revoke a key signature"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "sign a key"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "sign a key locally"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "sign or edit a key"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "change a passphrase"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "export keys"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "export keys to a keyserver"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "import keys from a keyserver"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "search for keys on a keyserver"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "update all keys from a keyserver"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "import/merge keys"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr "print the card status"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr "change data on a card"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr "change a card's PIN"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "update the trust database"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid "print message digests"
 msgstr "print message digests"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "run in server mode"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|set the TOFU policy for a key"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|use NAME as default secret key"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 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:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|set up email aliases"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr "use strict OpenPGP behavior"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "do not make any changes"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "prompt before overwriting"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr "Options controlling the input"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr "Options controlling the output"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "create ascii armored output"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|write output to FILE"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "use canonical text mode"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set compress level to N (0 disables)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr "Options controlling key import and export"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 msgid "import missing key from a signature"
 msgstr "import missing key from a signature"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 msgid "include the public key in signatures"
 msgstr "include the public key in signatures"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "disable all access to the dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr "Options controlling key listings"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 msgid "Options to specify keys"
 msgstr "Options to specify keys"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|encrypt for USER-ID"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|use USER-ID to sign or decrypt"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr "Options for unattended use"
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr "Other options"
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2770,7 +2776,7 @@ msgstr ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2790,11 +2796,11 @@ msgstr ""
 " --list-keys [names]        show keys\n"
 " --fingerprint [names]      show fingerprints\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Usage: @GPG@ [options] [files] (-h for help)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2804,7 +2810,7 @@ msgstr ""
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2812,556 +2818,556 @@ msgstr ""
 "\n"
 "Supported algorithms:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "usage: %s [options] %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "conflicting commands\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = sign found in group definition ‘%s’\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "WARNING: unsafe ownership on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "WARNING: unsafe ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "WARNING: unsafe permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "WARNING: unsafe permissions on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "WARNING: unsafe permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "WARNING: unsafe enclosing directory ownership on homedir ‘%s’\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory ownership on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "WARNING: unsafe enclosing directory ownership on extension ‘%s’\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "WARNING: unsafe enclosing directory permissions on homedir ‘%s’\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr ""
 "WARNING: unsafe enclosing directory permissions on configuration file ‘%s’\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "WARNING: unsafe enclosing directory permissions on extension ‘%s’\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "unknown configuration item ‘%s’\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr "display photo IDs during key listings"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 msgid "show key usage information during key listings"
 msgstr "show key usage information during key listings"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr "show policy URLs during signature listings"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 msgid "show all notations during signature listings"
 msgstr "show all notations during signature listings"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr "show IETF standard notations during signature listings"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr "show user-supplied notations during signature listings"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "show preferred keyserver URLs during signature listings"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr "show user ID validity during key listings"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr "show revoked and expired user IDs in key listings"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr "show revoked and expired subkeys in key listings"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 msgid "show the keyring name in key listings"
 msgstr "show the keyring name in key listings"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 msgid "show expiration dates during signature listings"
 msgstr "show expiration dates during signature listings"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "unknown TOFU policy ‘%s’\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(use “help� to list choices)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "This command is not allowed while in %s mode.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Note: %s is not for normal use!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’ is not a valid signature expiration\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s� is not a proper mail address\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "invalid pinentry mode ‘%s’\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "invalid request origin ‘%s’\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’ is not a valid character set\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "could not parse keyserver URL\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: invalid keyserver options\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "invalid keyserver options\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: invalid import options\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "invalid import options\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "invalid filter option: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: invalid export options\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "invalid export options\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: invalid list options\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr "invalid list options\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr "display photo IDs during signature verification"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr "show policy URLs during signature verification"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 msgid "show all notations during signature verification"
 msgstr "show all notations during signature verification"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr "show IETF standard notations during signature verification"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr "show user-supplied notations during signature verification"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "show preferred keyserver URLs during signature verification"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 msgid "show user ID validity during signature verification"
 msgstr "show user ID validity during signature verification"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "show revoked and expired user IDs in signature verification"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 msgid "show only the primary user ID in signature verification"
 msgstr "show only the primary user ID in signature verification"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: invalid verify options\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr "invalid verify options\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "unable to set exec-path to %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "invalid auto-key-locate list\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "invalid argument for option “%.50s�\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNING: program may create a core file!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNING: %s overrides %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s not allowed with %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s makes no sense with %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "WARNING: running with faked system time: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "will not run with insecure memory due to %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "selected cipher algorithm is invalid\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, c-format
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "selected AEAD algorithm is invalid\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "selected compression algorithm is invalid\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "selected certification digest algorithm is invalid\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed must be greater than 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed must be greater than 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth must be in the range from 1 to 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "invalid min-cert-level; must be 1, 2, or 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Note: simple S2K mode (0) is strongly discouraged\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "invalid S2K mode; must be 0, 1 or 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "invalid default preferences\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "invalid personal cipher preferences\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, c-format
 msgid "invalid personal AEAD preferences\n"
 msgstr "invalid personal AEAD preferences\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "invalid personal digest preferences\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "invalid personal compress preferences\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "chunk size invalid - using %d\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s does not yet work with %s\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "AEAD algorithm ‘%s’ may not be used in %s mode\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "compression algorithm ‘%s’ may not be used in %s mode\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "failed to initialize the TrustDB: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "WARNING: recipients (-r) given without using public key encryption\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetric encryption of ‘%s’ failed: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "you cannot use --symmetric --encrypt in %s mode\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "you cannot use --symmetric --sign --encrypt in %s mode\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver send failed: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver receive failed: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "key export failed: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "export as ssh key failed: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver search failed: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver refresh failed: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "invalid hash algorithm ‘%s’\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "error parsing key specification '%s': %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "‘%s’ does not appear to be a valid key ID, fingerprint or keygrip\n"
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Go ahead and type your message ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "the given certification policy URL is invalid\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "the given signature policy URL is invalid\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "the given preferred keyserver URL is invalid\n"
@@ -3374,7 +3380,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|write status info to this FD"
 
@@ -4085,7 +4091,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Are you sure you still want to sign it? (y/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  Unable to sign.\n"
 
@@ -4259,8 +4265,8 @@ msgstr "I have checked this key very carefully.\n"
 msgid "Really sign? (y/N) "
 msgstr "Really sign? (y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signing failed: %s\n"
@@ -4454,7 +4460,7 @@ 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:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "Key is revoked."
 
@@ -4502,7 +4508,7 @@ msgstr "Really remove this user ID? (y/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Really move the primary key? (y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr "You must select exactly one key.\n"
 
@@ -4577,161 +4583,161 @@ msgstr "Save changes? (y/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Quit without saving? (y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Key not changed so no update needed.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "revoking the user ID failed: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "setting the primary user ID failed: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "“%s� is not a fingerprint\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "“%s� is not the primary fingerprint\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Invalid user ID '%s': %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "No matching user IDs."
 msgstr "No matching user IDs."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "Nothing to sign.\n"
 msgstr "Nothing to sign.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Not signed by you.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "revoking the key signature failed: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "‘%s’ is not a valid expiration time\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "“%s� is not a proper fingerprint\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "subkey “%s� not found\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr "AEAD: "
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Features: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr "Preferred keyserver: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 msgid "Notations: "
 msgstr "Notations: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "There are no preferences on a PGP 2.x-style user ID.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "The following key was revoked on %s by %s key %s\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "This key may be revoked by %s key %s"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr "(sensitive)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "created: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr "revoked: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr "expired: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "expires: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr "usage: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr "card-no: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr "trust: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr "validity: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "This key has been disabled"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4739,17 +4745,17 @@ msgstr ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr "revoked"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "expired"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4758,17 +4764,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:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "WARNING: Your encryption subkey expires soon.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "You may want to change its expiration date too.\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4778,72 +4784,72 @@ msgstr ""
 "versions\n"
 "         of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Are you sure you still want to add it? (y/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "You may not add a photo ID to a PGP2-style key.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
-msgstr "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+msgid "Such a user ID already exists on this key!"
+msgstr "Such a user ID already exists on this key!"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Delete this good signature? (y/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Delete this invalid signature? (y/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Delete this unknown signature? (y/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Really delete this self-signature? (y/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, 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:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Nothing deleted.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "invalid"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID “%s� compacted: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID “%s�: already minimized\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID “%s�: already clean\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4853,40 +4859,40 @@ msgstr ""
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "You may not add a designated revoker to a PGP 2.x-style key.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Enter the user ID of the designated revoker: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "cannot appoint a PGP 2.x style key as a designated revoker\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "you cannot appoint a key as its own designated revoker\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "this key has already been designated as a revoker\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -4894,171 +4900,171 @@ msgstr ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changing expiration time for a subkey.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changing expiration time for the primary key.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "You can't change the expiration date of a v3 key\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 msgid "Changing usage of a subkey.\n"
 msgstr "Changing usage of a subkey.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 msgid "Changing usage of the primary key.\n"
 msgstr "Changing usage of the primary key.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signing subkey %s is already cross-certified\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "subkey %s does not sign and so does not need to be cross-certified\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Please select exactly one user ID.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "skipping v3 self-signature on user ID “%s�\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr "Enter your preferred keyserver URL: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Are you sure you want to replace it? (y/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Are you sure you want to delete it? (y/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 msgid "Enter the notation: "
 msgstr "Enter the notation: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 msgid "Proceed? (y/N) "
 msgstr "Proceed? (y/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No user ID with index %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No user ID with hash %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No subkey with key ID '%s'.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No subkey with index %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: “%s�\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "signed by your key %s on %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "This signature expired on %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Are you sure you still want to revoke it? (y/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Create a revocation certificate for this signature? (y/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "You have signed these user IDs on key %s:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr " (non-revocable)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revoked by your key %s on %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "You are about to revoke these signatures:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Really create the revocation certificates? (y/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "no secret key\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "tried to revoke a non-user ID: %s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "user ID “%s� is already revoked\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "WARNING: a user ID signature is dated %d seconds in the future\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Cannot revoke the last valid user ID.\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Key %s is already revoked.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subkey %s is already revoked.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, 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"
@@ -5470,6 +5476,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Please don't put the email address into the real name or the comment\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Such a user ID already exists on this key!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5785,54 +5795,54 @@ msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s� not a key ID: skipping\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "refreshing %d key from %s\n"
 msgstr[1] "refreshing %d keys from %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "WARNING: unable to refresh key %s via %s: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "key “%s� not found on keyserver\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "key not found on keyserver\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requesting key %s from %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "no keyserver known\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "skipped “%s�: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sending key %s to %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "requesting key from ‘%s’\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNING: unable to fetch URI %s: %s\n"
@@ -5862,67 +5872,67 @@ msgstr "encrypted with unknown algorithm %d.%s\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passphrase generated with unknown digest algorithm %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr "public key is %s\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "encrypted with %s key, ID %s, created %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s�\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "encrypted with %s key, ID %s\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "WARNING: multiple plaintexts seen\n"
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "encrypted with %lu passphrases\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "encrypted with 1 passphrase\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "public key decryption failed: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "public key encrypted data: good DEK\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "assuming %s encrypted data\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "WARNING: message was not integrity protected\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -5932,179 +5942,179 @@ msgstr ""
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Use the option ‘%s’ to decrypt anyway.\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "decryption forced to fail!\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "decryption okay\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "WARNING: encrypted message has been manipulated!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decryption failed: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Note: sender requested “for-your-eyes-only�\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "standalone revocation - use “gpg --import� to apply\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, c-format
 msgid "no signature found\n"
 msgstr "no signature found\n"
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "BAD signature from “%s�"
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Expired signature from “%s�"
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Good signature from “%s�"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signature verification suppressed\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "can't handle this ambiguous signature data\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature made %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               using %s key %s\n"
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature made %s using %s key ID %s\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               issuer “%s�\n"
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Key available at: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "Note: Use ‘%s’ to make use of this info\n"
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka “%s�"
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "WARNING: This key is not suitable for signing in %s mode\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature expired %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature expires %s\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s signature, digest algorithm %s%s%s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "binary"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "textmode"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "unknown"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 msgid ", key algorithm "
 msgstr ", key algorithm "
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "WARNING: not a detached signature; file ‘%s’ was NOT verified!\n"
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Can't check signature: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "not a detached signature\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "standalone signature of class 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "old style (PGP 2.x) signature\n"
@@ -6174,11 +6184,6 @@ msgstr "(further info: "
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: deprecated option “%s�\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "WARNING: “%s� is a deprecated option\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7224,133 +7229,133 @@ msgstr "read error in '%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync failed: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "can't create lock for ‘%s’\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "can't lock ‘%s’\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek failed: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "trustdb transaction too large\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: directory does not exist!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "can't access '%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: failed to create version record: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: invalid trustdb created\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb created\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Note: trustdb not writable\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: invalid trustdb\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: failed to create hashtable: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error updating version record: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error reading version record: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error writing version record: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek failed: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: not a trustdb file\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error reading free record: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error writing dir record: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: failed to zero a record: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: failed to append a record: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Error: The trustdb is corrupted.\n"
@@ -7967,16 +7972,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%sNumber: %s%%0AHolder: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Remaining attempts: %d"
@@ -8005,10 +8010,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN callback returned error: %s\n"
@@ -8028,119 +8033,119 @@ msgstr "PIN is too long; maximum length is %d\n"
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr "PIN has invalid characters; only digits are allowed\n"
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr "key already exists\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "existing key will be replaced\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr "generating new key\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, c-format
 msgid "writing new key\n"
 msgstr "writing new key\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "failed to store the key: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "response does not contain the RSA modulus\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "response does not contain the RSA public exponent\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "response does not contain the EC public key\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "please wait while key is being generated ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr "generating key failed\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "key generation completed (%d second)\n"
 msgstr[1] "key generation completed (%d seconds)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "response does not contain the public key data\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||Please enter the PIN for the key to create qualified signatures."
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Please enter the Admin PIN"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Please enter the PIN for the standard keys."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modulus missing or not of size %d bits\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA public exponent missing or larger than %d bits\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 msgid "Note: PIN has not yet been enabled."
 msgstr "Note: PIN has not yet been enabled."
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "the NullPIN has not yet been changed\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Please enter a new PIN for the standard keys."
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|Please enter a new PIN for the key to create qualified signatures."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8148,7 +8153,7 @@ msgstr ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8156,27 +8161,27 @@ msgstr ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error getting new PIN: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "failed to store the fingerprint: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "failed to store the creation date: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "error retrieving CHV status from card\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "reading public key failed: %s\n"
@@ -8184,42 +8189,42 @@ msgstr "reading public key failed: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "using default PIN as %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr "failed to use default PIN as %s: %s - disabling further default use\n"
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 msgid "||Please unlock the card"
 msgstr "||Please unlock the card"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN for CHV%d is too short; minimum length is %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verify CHV%d failed: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "card is permanently locked!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8227,20 +8232,20 @@ msgid_plural ""
 msgstr[0] "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgstr[1] "%d Admin PIN attempts remaining before card is permanently locked\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "access to admin commands is not configured\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 msgid "||Please enter the PIN"
 msgstr "||Please enter the PIN"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Please enter the Reset Code for the card"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Reset Code is too short; minimum length is %d\n"
@@ -8248,79 +8253,79 @@ msgstr "Reset Code is too short; minimum length is %d\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr "|RN|New Reset Code"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr "|AN|New Admin PIN"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr "|N|New PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Please enter the Admin PIN and New Admin PIN"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Please enter the PIN and New PIN"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr "error reading application data\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "error reading fingerprint DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "creation timestamp missing\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA prime %s missing or not of size %d bits\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, c-format
 msgid "unsupported curve\n"
 msgstr "unsupported curve\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "invalid structure of OpenPGP card (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "fingerprint on card does not match requested one\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "card does not support digest algorithm %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures created so far: %lu\n"
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "verification of Admin PIN is currently prohibited through this command\n"
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "can't access %s - invalid OpenPGP card?\n"
@@ -8340,7 +8345,7 @@ msgstr "|N|Initial New PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "run in multi server mode (foreground)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|set the debugging level to LEVEL"
 
@@ -8384,11 +8389,11 @@ msgstr "|LIST|change the application priority to LIST"
 msgid "deny the use of admin card commands"
 msgstr "deny the use of admin card commands"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Usage: @SCDAEMON@ [options] (-h for help)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8396,23 +8401,23 @@ msgstr ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "please use the option ‘--daemon’ to run the program in the background\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "handler for fd %d started\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "handler for fd %d terminated\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -8638,7 +8643,7 @@ msgstr "root certificate is not marked trusted"
 msgid "checking the trust list failed: %s\n"
 msgstr "checking the trust list failed: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certificate chain too long\n"
@@ -8693,7 +8698,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "a %u bit hash is not valid for a %u bit %s key\n"
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
@@ -8739,42 +8744,42 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "no key usage specified - assuming all usages\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "certificate should not have been used for certification\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certificate should not have been used for OCSP response signing\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certificate should not have been used for encryption\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certificate should not have been used for signing\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certificate is not usable for encryption\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certificate is not usable for signing\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "looking for another certificate\n"
@@ -8962,6 +8967,11 @@ msgstr "Create self-signed certificate? (y/N) "
 msgid "These parameters are used:\n"
 msgstr "These parameters are used:\n"
 
+#: sm/certreqgen-ui.c:433
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "error creating temporary file: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr "Now creating self-signed certificate.  "
@@ -9032,123 +9042,123 @@ msgstr "deleting certificate “%s� failed: %s\n"
 msgid "no valid recipients given\n"
 msgstr "no valid recipients given\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "list external keys"
 msgstr "list external keys"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "list certificate chain"
 msgstr "list certificate chain"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 msgid "import certificates"
 msgstr "import certificates"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "export certificates"
 msgstr "export certificates"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr "register a smartcard"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr "pass a command to the dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr "invoke gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "don't use the terminal at all"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr "|N|number of certificates to include"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|take policy information from FILE"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr "assume input is in PEM format"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr "assume input is in base-64 format"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr "assume input is in binary format"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 msgid "create base-64 encoded output"
 msgstr "create base-64 encoded output"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|use USER-ID as default secret key"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|add keyring to the list of keyrings"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr "fetch missing issuer certificates"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|use encoding NAME for PKCS#12 passphrases"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr "never consult a CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr "do not check CRLs for root certificates"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr "check validity using OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr "do not check certificate policies"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|use cipher algorithm NAME"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|use message digest algorithm NAME"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "batch mode: never ask"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "assume yes on most questions"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "assume no on most questions"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|write an audit log to FILE"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Usage: @GPGSM@ [options] [files] (-h for help)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9158,27 +9168,27 @@ msgstr ""
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 "Default operation depends on the input data\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Note: won't be able to encrypt to '%s': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "unknown validation model ‘%s’\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importing common certificates ‘%s’\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "can't sign using '%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "invalid command (there is no implicit command)\n"
@@ -9208,7 +9218,7 @@ msgstr "error getting stored flags: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "error importing certificate: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "error reading input: %s\n"
@@ -9248,7 +9258,7 @@ msgstr "problem re-searching certificate: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "error storing flags: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Error - "
 
@@ -9619,11 +9629,6 @@ msgstr "failed to create temporary cache dir file '%s': %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "error closing '%s': %s\n"
 
-#: dirmngr/crlcache.c:948
-#, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "error renaming ‘%s’ to '%s': %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
@@ -10290,92 +10295,92 @@ msgstr "valid debug levels are: %s\n"
 msgid "usage: %s [options] "
 msgstr "usage: %s [options] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "colons are not allowed in the socket name\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fetching CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "processing CRL from ‘%s’ failed: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: line too long - skipped\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: invalid fingerprint detected\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: read error: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: garbage at end of line ignored\n"
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "SIGHUP received - re-reading configuration and flushing caches\n"
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 received - no action defined\n"
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM received - shutting down ...\n"
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM received - still %d active connections\n"
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, c-format
 msgid "shutdown forced\n"
 msgstr "shutdown forced\n"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT received - immediate shutdown\n"
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d received - no action defined\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "error accessing '%s': http status %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL ‘%s’ redirected to ‘%s’ (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "too many redirections\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "redirection changed to ‘%s’\n"
@@ -10736,55 +10741,55 @@ msgstr "certificate chain is good\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certificate should not have been used for CRL signing\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "quiet"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr "print data out hex encoded"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr "decode received data lines"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr "connect to the dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "connect to the keyboxd"
 msgstr "connect to the keyboxd"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|connect to Assuan socket NAME"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|connect to Assuan server at ADDR"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr "run the Assuan server given on the command line"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr "do not use extended connect mode"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|run commands from FILE on startup"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr "run /subst on startup"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Usage: @GPG@-connect-agent [options] (-h for help)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -10792,48 +10797,48 @@ msgstr ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "option “%s� requires a program and optional arguments\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "option “%s� ignored due to “%s�\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "receiving line failed: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "line too long - skipped\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "line shortened due to embedded Nul character\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "unknown command ‘%s’\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "sending line failed: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "no keybox daemon running in this session\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error sending standard options: %s\n"
@@ -10893,12 +10898,12 @@ msgstr "External verification of component %s failed"
 msgid "Note that group specifications are ignored\n"
 msgstr "Note that group specifications are ignored\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "error closing ‘%s’\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "error parsing ‘%s’\n"
diff --git a/po/eo.po b/po/eo.po
index bfd7908..2b2c5fb 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
@@ -28,53 +28,53 @@ msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, fuzzy
 #| msgid "Do you really want to create a sign and encrypt key? "
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Ĉu vi vere volas krei subskriban kaj ĉifran �losilon? "
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "nevalida pasfrazo"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -85,28 +85,28 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "pasfrazo estas tro longa\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -116,107 +116,107 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "malbona pasfrazo"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "PIN too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nevalida signo en nomo\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad PIN"
 msgstr "malbona MPI"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "malbona pasfrazo"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/command.c:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -228,9 +228,9 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
@@ -238,15 +238,15 @@ msgstr "ne povas krei '%s': %s\n"
 
 #: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -257,138 +257,129 @@ 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:2513
+#: agent/command-ssh.c:2467
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Donu la uzantidentigilon: "
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Ripetu pasfrazon: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Ripetu pasfrazon: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Ripetu pasfrazon: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "eraro dum kreado de pasfrazo: %s\n"
-
-#: agent/genkey.c:150
+#: agent/genkey.c:154
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "skribas al '%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Donu pasfrazon\n"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -396,7 +387,7 @@ msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "Nomo devas havi almenaÅ­ 5 signojn\n"
 msgstr[1] "Nomo devas havi almenaÅ­ 5 signojn\n"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -404,384 +395,383 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Ĉu tamen uzi ĉi tiun �losilon? "
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "Åœlosilo estas anstataÅ­igita."
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "detala eligo"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualigi la fido-datenaron"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "ne realigita"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "ne realigita"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|uzi pasfraz-re�imon N"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "uzi gpg-agent"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, fuzzy, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, fuzzy, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Valida atestilrevoko"
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, fuzzy, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2832
+#: agent/gpg-agent.c:2842
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu �losiloj ignoritaj\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
@@ -807,7 +797,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -817,7 +807,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -871,42 +861,42 @@ msgstr "nuligita de uzanto\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "kiraso: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "sekretaj �losilpartoj ne estas disponataj\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "kiraso: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -919,19 +909,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "jes"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -944,7 +934,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -954,48 +944,63 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "eraro dum legado de '%s': %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 #, fuzzy
 msgid "Change passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1231
+#, c-format
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1741
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Ĉu vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 #, fuzzy
 msgid "Delete key"
 msgstr "�alti �losilon"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1017,7 +1022,7 @@ msgstr ""
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
@@ -1059,7 +1064,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -1121,12 +1126,12 @@ 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:905
+#: common/sysutils.c:880
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
@@ -1357,7 +1362,7 @@ msgid "algorithm: %s"
 msgstr "kiraso: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1530,7 +1535,7 @@ msgstr "enkirasigo malsukcesis: %s\n"
 msgid "iconv_open failed: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
@@ -1569,7 +1574,7 @@ msgstr "publika �losilo %08lX ne trovita: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1740,7 +1745,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
@@ -1782,7 +1787,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "krei revokatestilon"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1810,7 +1815,7 @@ msgstr "ne povas fari tion en neinteraga re�imo\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "sekretaj �losilpartoj ne estas disponataj\n"
@@ -1877,15 +1882,15 @@ msgstr "skribas publikan �losilon al '%s'\n"
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
@@ -2233,27 +2238,27 @@ msgstr "skribas sekretan �losilon al '%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por ĉi tiu komando\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2315,8 +2320,8 @@ msgid "subkey"
 msgstr "al"
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
@@ -2378,14 +2383,14 @@ msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2407,7 +2412,7 @@ msgstr "NOTO: ĉifrad-metodo %d ne trovita en preferoj\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2514,12 +2519,12 @@ msgstr "skribas sekretan �losilon al '%s'\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "�losilo %08lX: PGP-2.x-stila �losilo - ignorita\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, fuzzy, c-format
 #| msgid "error creating `%s': %s\n"
@@ -2588,297 +2593,297 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 #, fuzzy
 msgid "make a signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "ĉifri datenojn"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "ĉifri nur kun simetria ĉifro"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "malĉifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "subskribi aŭ redakti �losilon"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "serĉi �losilojn ĉe �losilservilo"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "aktualigi ĉiujn �losilojn de �losilservilo"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 #, fuzzy
 msgid "print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOMO|ĉifri por NOMO"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOMO|ĉifri por NOMO"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "uzi ĉi tiun uzantidentigilon por subskribi aŭ malĉifri"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2886,7 +2891,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de ĉiuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2916,13 +2921,13 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2937,7 +2942,7 @@ msgstr ""
 "subskribi, kontroli, ĉifri aŭ malĉifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2945,569 +2950,569 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, fuzzy, c-format
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, fuzzy, c-format
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita ĉifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita ĉifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, fuzzy, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, fuzzy, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 aÅ­ 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, fuzzy, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 aÅ­ 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 aŭ 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, fuzzy, c-format
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, fuzzy, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 msgid "invalid personal AEAD preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, fuzzy, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, fuzzy, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "malĉifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, fuzzy, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -3522,7 +3527,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
@@ -4242,7 +4247,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi �in?\n"
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -4458,8 +4463,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Ĉu vere subskribi? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
@@ -4674,7 +4679,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 #, fuzzy
 msgid "Key is revoked."
 msgstr "Åœlosilo estas revokita.\n"
@@ -4728,7 +4733,7 @@ msgstr "Ĉu vere forigi ĉi tiun uzantidentigilon? "
 msgid "Really move the primary key? (y/N) "
 msgstr "Ĉu vere forigi ĉi tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vi devas elekti almenaŭ unu �losilon.\n"
@@ -4815,205 +4820,205 @@ msgstr "Ĉu skribi �an�ojn? "
 msgid "Quit without saving? (y/N) "
 msgstr "Ĉu fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Ŝlosilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Uzantidentigilo ne ekzistas.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Nenio por subskribi per �losilo %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 #, fuzzy
 msgid "Notations: "
 msgstr "Notacio: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Ĉi tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Ĉi tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Ĉi tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5022,36 +5027,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Ĉu forvi�i ĉi tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Ĉu forvi�i ĉi tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Ĉu forvi�i ĉi tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Ĉu vere forvi�i ĉi tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5059,37 +5064,37 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Forvi�is %d subskribon.\n"
 msgstr[1] "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "nevalida"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -5099,226 +5104,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:4548
+#: g10/keyedit.c:4604
 #, fuzzy
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVERTO: Ĉi tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi �in?\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi �in?\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ŝan�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ŝan�as la daton de eksvalidi�o de la ĉefa �losilo.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Ŝan�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Ŝan�as la daton de eksvalidi�o de la ĉefa �losilo.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi �in?\n"
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas subskribi �in?\n"
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ĉu surskribi (j/N)? "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ĉu vi estas certa, ke vi ankoraŭ volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ĉu vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5745,6 +5750,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Bonvolu ne meti la retadreson en la veran nomon aÅ­ la komenton\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -6082,56 +6091,56 @@ msgstr "nevalida �losilaro"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: ne valida �losilidentigilo\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 msgstr[1] "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignoris '%s': %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
@@ -6163,252 +6172,252 @@ msgstr "ĉifrita per nekonata metodo %d\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "ĉifrita per nekonata metodo %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "publika �losilo estas %08lX\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "ĉifrita per %u-bita %s-�losilo, %08lX, kreita je %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "ĉifrita per %s-�losilo, %08lX\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, fuzzy, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila malĉifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "publik�losile ĉifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supozas %s ĉifritajn datenojn\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Ĉifro IDEA ne disponata, optimisme provas uzi %s anstataŭe\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, fuzzy, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "malĉifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "malĉifrado sukcesis\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: ĉifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "malĉifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Eksvalidi�inta subskribo de \""
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "ne povas trakti ĉi tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, fuzzy, c-format
 msgid "Key available at: "
 msgstr "Nenia helpo disponata"
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "AVERTO: Ĉi tiu �losilo ne estas atestita kun fidata subskribo!\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Ĉi tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 #, fuzzy
 msgid "binary"
 msgstr "ĉefa"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "nekonata publik�losila metodo"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
@@ -6478,11 +6487,6 @@ msgstr ""
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:1188
-#, fuzzy, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "AVERTO: '%s' estas malplena dosiero\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7553,133 +7557,133 @@ msgstr "kiraso: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "fido-datenaro: sync malsukcesis: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "fido-datenaro loko %lu: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "fido-datenaro loko %lu: skribo malsukcesis (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "fido-datenaro-transakcio tro granda\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dosierujo ne ekzistas!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: malsukcesis krei versiregistron: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: nevalida fido-datenaro kreita\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: fido-datenaro kreita\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, fuzzy, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "sekretaj �losilpartoj ne estas disponataj\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: nevalida fido-datenaro\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eraro dum aktualigo de versiregistro: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eraro dum legado de versiregistro: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eraro dum skribado de versiregistro: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "fido-datenaro: lseek malsukcesis: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ne estas fido-datenaro\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiregistro kun registronumero %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eraro dum skribo de dosieruja registro: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: malsukcesis nuligi registron: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: malsukcesis aldoni registron: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: fido-datenaro kreita\n"
@@ -8295,16 +8299,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8339,10 +8343,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8362,158 +8366,158 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "krei novan �losilparon"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "krei novan �losilparon"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "Kreado de �losiloj malsukcesis: %s\n"
 msgstr[1] "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Kialo por revoko: "
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Noto: Ĉi tiu �losilo estas mal�altita.\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Kialo por revoko: "
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
@@ -8521,43 +8525,43 @@ msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8565,22 +8569,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Kialo por revoko: "
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8588,81 +8592,81 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "nerealigita URI"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@ -8684,7 +8688,7 @@ msgstr "Donu la uzantidentigilon: "
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8733,33 +8737,33 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "malkongruaj komandoj\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
@@ -8998,7 +9002,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, fuzzy, c-format
 msgid "certificate chain too long\n"
 msgstr "Valida atestilrevoko"
@@ -9055,7 +9059,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -9102,42 +9106,42 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 #| msgid "bad certificate"
 msgid "looking for another certificate\n"
@@ -9334,6 +9338,11 @@ msgstr "Ĉu krei revokatestilon por ĉi tiu subskribo? (j/N)"
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:433
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "eraro dum kreado de pasfrazo: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9405,134 +9414,134 @@ msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 msgid "no valid recipients given\n"
 msgstr "nevalida respondo de agento\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "list external keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Valida atestilrevoko"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 #, fuzzy
 msgid "import certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "export certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "krei eligon en askia kiraso"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "aldoni ĉi tiun �losilaron al la listo de �losilaroj"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOMO|uzi ĉifrad-metodon NOMO por pasfrazoj"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi ĉifrad-metodon NOMO"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "neinteraga re�imo: neniam demandi"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" ĉe la plej multaj demandoj"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" ĉe la plej multaj demandoj"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9543,27 +9552,27 @@ msgstr ""
 "subskribi, kontroli, ĉifri aŭ malĉifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9593,7 +9602,7 @@ msgstr "eraro dum kreado de pasfrazo: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -9633,7 +9642,7 @@ msgstr "rev? problemo en kontrolo de revoko: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -9995,12 +10004,6 @@ msgstr "%s: ne povas krei dosierujon: %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/crlcache.c:948
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "eraro dum legado de '%s': %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
@@ -10690,93 +10693,93 @@ msgstr ""
 msgid "usage: %s [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "pasfrazo estas tro longa\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "kiraso: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "ne traktita"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "tro da '%c'-preferoj\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11147,105 +11150,105 @@ msgstr "Valida atestilrevoko"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "fini"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "pasfrazo estas tro longa\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "gpg-agent ne estas disponata en ĉi tiu sesio\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
@@ -11311,12 +11314,12 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -11506,6 +11509,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "skribas al '%s'\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "Åœlosilo estas anstataÅ­igita."
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Nomo ne povas komenci�i per cifero\n"
 
@@ -11749,10 +11761,6 @@ msgstr ""
 #~ msgstr "ne povas malfermi %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "eraro dum skribado de �losilaro '%s': %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "eraro dum legado de '%s': %s\n"
 
diff --git a/po/es.gmo b/po/es.gmo
index 9676af2..30dc2b6 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 1d21b6a..97f4fc5 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2018-05-25 15:44+0000\n"
 "Last-Translator: emma peel <emma.peel@riseup.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.8.11\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "no pude conseguir el bloqueo de entrada de pin: %s\n"
@@ -32,49 +32,49 @@ msgstr "no pude conseguir el bloqueo de entrada de pin: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Cancelar"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Sí"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Guardar en gestor de contraseñas"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "¿De verdad quiere hacer que su frase contraseña se vea en la pantalla?"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Mostrar frase contraseña"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Esconder frase contraseña"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -85,7 +85,7 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -94,14 +94,14 @@ msgstr "barra de calidad, entrada de pin"
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -109,7 +109,7 @@ msgstr "Frase contraseña demasiado larga"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Calidad:"
 
@@ -119,18 +119,18 @@ msgstr "Calidad:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr "barra de calidad, entrada de pin"
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 "Por favor introduzca su PIN para desbloquear la clave secreta de esta sesión"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -138,7 +138,7 @@ msgstr ""
 "Por favor introduzca la frase contraseña para desbloquear la clave secreta "
 "de esta sesión"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr "PIN:"
 
@@ -151,46 +151,46 @@ msgstr "PIN:"
 # ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
 # ¿Es que son más listos? :-)
 #
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Frase contraseña:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "no coincide - reinténtelo"
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (intento %d de %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr "Repetir:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 msgid "PIN too long"
 msgstr "PIN demasiado largo"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 msgid "Passphrase too long"
 msgstr "Frase contraseña demasiado larga"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 msgid "Invalid characters in PIN"
 msgstr "Caracteres inválidos en el PIN"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr "PIN demasiado corto"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad PIN"
 msgstr "PIN incorrecto"
 
@@ -203,29 +203,29 @@ msgstr "PIN incorrecto"
 # ¿Por qué los ingleses entonces sí que saben lo que es un "passphrase"?
 # ¿Es que son más listos? :-)
 #
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad Passphrase"
 msgstr "Frase contraseña errónea"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Por favor vuelva a introducir frase contraseña"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, 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:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -248,24 +248,24 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "no pueden usarse claves ssh de más de %d bits\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, 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
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, 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:2513
+#: agent/command-ssh.c:2467
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "error intentando obtener lista de tarjetas: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, 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:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Permitir"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Denegar"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr ""
 "Por favor introduzca la frase contraseña para la clave ssh %%0A %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -312,83 +312,75 @@ 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:3708
+#: agent/command-ssh.c:3797
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "fallo al crear un flujo desde el socket: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Por favor inserte la tarjeta con número de serie"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "PIN del Administrador"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Código de Reinicio"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0A Use el teclado del lector como entrada."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Repita este Código de Reinicio"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Repita este PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Repita este PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Código de Reinicio repetido incorrectamente; inténtelo de nuevo"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK repetido incorrectamente; inténtelo de nuevo"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN repetido incorrectamente; inténtelo de nuevo"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Por favor introduzca el PIN%s%s%s para desbloquear la tarjeta"
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "error al crear fichero temporal: %s\n"
-
-#: agent/genkey.c:150
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "error escribiendo en el fichero temporal: %s\n"
+#: agent/genkey.c:154
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "error escribiendo en %s: %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 msgid "Enter new passphrase"
 msgstr "Introduzca nueva frase contraseña"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
@@ -396,7 +388,7 @@ msgstr ""
 "¡No ha introducido una frase contraseña!%0AnNo se permiten frases contraseña "
 "en blanco."
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -405,18 +397,18 @@ msgstr ""
 "No ha introducido una frase contraseña -¡esto es en general una mala idea!"
 "%0Apor favor confirme que no quiere ninguna protección para su clave."
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr "Sí, no se necesita protección"
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "Una frase contraseña debe tener al menos %u caracter."
 msgstr[1] "Una frase contraseña debe tener al menos %u caracteres."
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -428,194 +420,190 @@ msgstr[1] ""
 "Una frase contraseña debe tener al menos %u dígitos o %%0A caracteres "
 "especiales."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Una frase contraseña no puede ser un término conocido%%0A o ajustarse a "
 "cierto patrón."
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Aviso: ha introducido una frase contraseña insegura."
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 msgid "Take this one anyway"
 msgstr "Tomar esta de todas formas"
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Por favor introduzca frase contraseña para%0Aproteger su nueva clave"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 msgid "Please enter the new passphrase"
 msgstr "Por favor escriba la nueva frase contraseña"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Opciones útiles para el depurado"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr "ejecutar en modo demonio (segundo plano)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr "ejecutar en modo servidor (primer plano)"
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-msgid "run in supervised mode"
-msgstr "ejecutar en modo supervisado"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr "no independizarse de la consola"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr "salida de datos estilo sh"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr "salida de datos estilo csh"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|lee opciones desde FICHERO"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr "Opciones que controlan la salida de diagnósticos"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "prolijo"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "algo más discreto"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|escribir logs en modo servidor en FICHERO"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr "Opciones que controlan la configuración"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "no usar SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|usar PCM como programa SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|usar PCM como programa SCdaemon"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|aceptar algunos comandos via NAME"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignorar peticiones de cambiar el TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignorar peticiones de cambiar el display X"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "permitir soporte de ssh-agent"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|usar ALGO para mostrar las huellas digitales de ssh"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "habilitar soporte de putty"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 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:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|los PINs en la caché expiran en N segundos"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|las claves SSH caducan en N segundos"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|establecer vida máxima del caché de PIN en N segundos"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|establecer vida máxima de la clave SSH en N segundos"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr "no usar el caché de PINs al firmar"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 msgid "disallow the use of an external password cache"
 msgstr "no permitir el uso de un cache externo de contraseñas"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "no permitir que los clientes marquen claves como \"confiables\""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 msgid "allow presetting passphrase"
 msgstr "permitir preestablecer frase contraseña"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr "Opciones que fuerzan una política de frases contraseña"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr "no permitir evitar la política de frases contraseña"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|establecer longitud mínima para nuevas frases contraseña en N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|pedir al menos N caracteres no alfabéticos para nuevas contraseñas"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|comprobar nuevas frases contraseña con el patrón en FICHERO"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|frase contraseña caduca tras N días"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 msgid "do not allow the reuse of old passphrases"
 msgstr "no permite reusar antiguas frases contraseña"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
@@ -623,50 +611,50 @@ msgstr "Opciones que controlan la seguridad"
 
 # usa
 # Vale.
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "usa el agente gpg"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr "no permitir que el caller cambie la entrada de pin"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "no acaparar teclado y ratón"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|usar PGM como el programa para entrada de PIN"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|establecer vida máxima de Pinentry en N segundos"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "permitir que Emacs pida la clave"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uso: @GPG_AGENT@ [opciones] (-h para ayuda)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -674,132 +662,137 @@ msgstr ""
 "Sintaxis: @GPG_AGENT@ [opciones] [orden [argumentos]]\n"
 "Manejo de claves privadas por @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "el nivel de depuración '%s' no es válido\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inválido\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "leyendo opciones de '%s'\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ATENCIÓN: \"%s\" es una opción obsoleta\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "no se puede crear el socket: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "el nombre de socket '%s' es demasiado largo\n"
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "error obteniendo valor único para el socket\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "error enlazando el socket con '%s': %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, 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:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "escuchando en el socket '%s'\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "no se puede crear el directorio '%s': %s\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "creado el directorio '%s'\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() falló para '%s': %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "no puede usar '%s' como directorio personal\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, 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:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "manejador 0x%lx para descriptor %d iniciado\n"
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, 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:2832
+#: agent/gpg-agent.c:2842
 #, 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:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, 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:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s detenido\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "no hay un agente gpg ejecutándose en esta sesión\n"
@@ -828,7 +821,7 @@ msgstr ""
 # Sí, este no he podido ser yo :-) Por cierto, ¿por qué la O no se
 # puede acentuar? ¿demasiado alta?
 # ¿Quién dice que no se puede? :-)
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -838,7 +831,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -893,42 +886,42 @@ msgstr "cancelado\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error pidiendo la frase contraseña: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "error abriendo '%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "fichero '%s', línea %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "declaración \"%s\" ignorada en '%s', línea %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "la lista de confianza '%s' del sistema no está disponible\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "huella digital incorrecta en '%s', línea %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "opción de clave inválida en '%s', línea %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "error al leer '%s', línea %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "error al leer la lista de certificados raíz fiables\n"
@@ -941,7 +934,7 @@ msgstr "error al leer la lista de certificados raíz fiables\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -950,11 +943,11 @@ msgstr ""
 "¿Confía absolutamente en%%0A  \"%s\"%%0A para certificar correctamentelos "
 "certificados de otros usuarios?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 msgid "Yes"
 msgstr "Sí"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -967,7 +960,7 @@ msgstr "No"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -979,21 +972,26 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr "Correcto"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr "Incorrecto"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "error al renombrar '%s' a '%s': %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Nota: Esta frase contraseña nunca ha sido cambiada.%0APor favor hágalo ahora."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -1002,15 +1000,29 @@ msgstr ""
 "Esta frase contraseña no se ha cambiado%%0Adesde %.4s-%.2s-%.2s.Por favor "
 "cámbiela ahora."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 msgid "Change passphrase"
 msgstr "Cambia la frase contraseña"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr "La cambiaré más tarde"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr "Por favor inserte la tarjeta con número de serie"
+
+#: 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?"
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+"Un proceso ssh requirió el uso de la clave%%0A  %s%%0A  (%s)%%0A¿Quiere "
+"permitirlo?"
+
+#: agent/findkey.c:1741
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -1019,11 +1031,11 @@ msgstr ""
 "¿De verdad quiere borrar la clave identificada con el keygrip%%0A  %s%%0A  "
 "%%C%%0A?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 msgid "Delete key"
 msgstr "Borrar clave"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1047,7 +1059,7 @@ msgstr "la clave %s usa un hash inseguro (de %u bits)\n"
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "un hash de %zu bits no vale para %u bits de la clave %s\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "la comprobación de la firma creada falló: %s\n"
@@ -1086,7 +1098,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "error bifurcando procesos: %s\n"
@@ -1147,12 +1159,12 @@ 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:905
+#: common/sysutils.c:880
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "esperando que el archivo '%s' esté disponible ...\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "renombrar '%s' a '%s' falló: %s\n"
@@ -1374,7 +1386,7 @@ msgid "algorithm: %s"
 msgstr "algoritmo: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "algoritmo no disponible: %s"
@@ -1529,7 +1541,7 @@ msgstr "la conversión de '%s' a '%s' no está disponible\n"
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open falló: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "la conversión de '%s' a '%s' falló: %s\n"
@@ -1568,7 +1580,7 @@ msgstr "bloqueo '%s' no hecho: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "esperando al bloqueo %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
@@ -1738,7 +1750,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "no hay agente dirmngr activo en esta sesión\n"
@@ -1783,7 +1795,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "genera un certificado de revocación"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1811,7 +1823,7 @@ msgstr "imposible hacer esto en modo de proceso por lotes\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Esta orden solo está disponible en tarjetas versión 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "No hay Código de Reinicio o ya no está disponible\n"
@@ -1876,14 +1888,14 @@ msgstr "URL de donde recuperar la clave pública: "
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "error al leer '%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
@@ -2224,26 +2236,26 @@ msgstr "No se permiten órdenes de administrador\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inválida (pruebe \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "no se puede abrir '%s'\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave \"%s\" no encontrada: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2302,8 +2314,8 @@ msgid "subkey"
 msgstr "subclave"
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualización fallida: %s\n"
@@ -2365,14 +2377,14 @@ msgstr "no se puede usar el cifrado '%s' en modo %s\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "no se puede usar el cifrado '%s' en modo %s\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2397,7 +2409,7 @@ msgstr ""
 "ATENCIÓN: la clave %s no es adecuada para la encriptación en modo %s\n"
 "\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2502,12 +2514,12 @@ msgstr "no se permite exportar claves secretas\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clave %s: clave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "ATENCIÓN: no se ha exportado nada\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, c-format
 msgid "error creating '%s': %s\n"
@@ -2571,280 +2583,280 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "parámetros válidos para la opción '%s':\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 msgid "make a signature"
 msgstr "crea una firma"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "make a clear text signature"
 msgstr "crea una firma en texto claro"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "cifra sólo con un cifrado simétrico"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 msgid "quickly generate a new key pair"
 msgstr "genera un nuevo par de claves en modo rápido"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "quickly add a new user-id"
 msgstr "añade una nueva id de usuario en modo rápido"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 msgid "quickly revoke a user-id"
 msgstr "revoca una id de usuario en modo rápido"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly set a new expiration date"
 msgstr "cambia la fecha de caducidad de modo rápido"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr "generación de claves con todas las funcionalidades"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocación"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo público"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "quickly sign a key"
 msgstr "firma una clave en modo rápido"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "quickly sign a key locally"
 msgstr "firma una clave localmente en modo rápido"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "quickly revoke a user-id"
 msgid "quickly revoke a key signature"
 msgstr "revoca una id de usuario en modo rápido"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "cambia una frase contraseña"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr "escribir estado de la tarjeta"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr "cambiar datos en la tarjeta"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr "cambiar el PIN de la tarjeta"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid "print message digests"
 msgstr "imprime resúmenes de mensaje"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "ejecutar en modo servidor"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|decide la política TOFU de una clave"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|usa NOMBRE como clave secreta por defecto"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 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:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|establecer alias de email"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr "usar estilo OpenPGP estricto"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "no hace ningún cambio"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Opciones que controlan la seguridad"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 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:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|volcar salida en FICHERO"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "usa modo de texto canónico"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|nivel de compresión N (0 desactiva)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 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:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|usa MECANISMOS para encontrar claves por emails"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "prohibir todo acceso al dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "Opciones que controlan la configuración"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|cifra para ID-USUARIO"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|usa este identificador para firmar o descifrar"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
@@ -2852,7 +2864,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:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2860,7 +2872,7 @@ msgstr ""
 "@\n"
 "(Véase en la página del manual la lista completo de órdenes y opciones)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2880,11 +2892,11 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Uso: @GPG@ [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2894,7 +2906,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operación por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2902,73 +2914,73 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Clave pública: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Compresión: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uso: %s [opciones] %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "órdenes incompatibles\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no se encontró el signo = en la definición de grupo '%s'\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal '%s'\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "AVISO: propiedad insegura del fichero de configuración '%s'\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVISO: propiedad insegura de la extensión '%s'\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal '%s'\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "AVISO: permisos inseguros del fichero de configuración '%s'\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVISO: permisos inseguros de la extensión '%s'\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "AVISO: propiedad insegura del directorio contenedor de '%s'\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2976,18 +2988,18 @@ msgstr ""
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuración '%s'\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "AVISO: propiedad insegura del directorio contenedor de la extensión '%s'\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "AVISO: permisos inseguros del directorio contenedor de '%s'\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2995,451 +3007,451 @@ msgstr ""
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuración '%s'\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "AVISO: permisos inseguros del directorio contenedor de la extensión '%s'\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "artículo de configuración desconocido '%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr "mostrar foto IDs al listar claves"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 msgid "show key usage information during key listings"
 msgstr "mostrar información de uso de las claves al listarlas"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr "mostrar URLS de política al listar firmas"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 msgid "show all notations during signature listings"
 msgstr "mostrar todas las notaciones al listar firmas"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr "mostrar notaciones estándar IETF al listar firmas"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr "mostrar notaciones personalizadas al listar firmas"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "mostrar URL del servidor de claves preferido al listar firmas"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr "mostrar validez de la ID de usuario al listar claves"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr "mostrar subclaves revocadas y expiradas al listar claves"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 msgid "show the keyring name in key listings"
 msgstr "mostrar nombre de los anillos de claves al listar claves"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 msgid "show expiration dates during signature listings"
 msgstr "mostrar fechas de caducidad al listar firmas"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "política TOFU desconocida '%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(usa \"ayuda\" para listar las opciones)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Esta orden no se permite en modo %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "NOTA: ¡%s no es para uso normal!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' no es una fecha de caducidad de firma válida\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" no es una dirección de email válida\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 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:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "origen incorrecto de la consulta '%s'\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' no es un juego de caracteres válido\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inválidas\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inválidas\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importación inválidas\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "opciones de importación inválidas\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opción de filtro inválida: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportación inválidas\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "opciones de exportación inválidas\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inválida\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr "lista de opciones inválida\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr "mostrar foto IDs al verificar firmas"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr "mostrar URLs de política al verificar firmas"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 msgid "show all notations during signature verification"
 msgstr "mostrar todas las notaciones al verificar firmas"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr "mostrar notaciones estándar IETF al verificar firmas"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr "mostrar notaciones personalizadas al verificar firmas"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 msgid "show user ID validity during signature verification"
 msgstr "mostrar validez del ID de usuario al verificar firmas"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 msgid "show only the primary user ID in signature verification"
 msgstr "mostrar solo ID primario de usuario al verificar firmas"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificación inválidas\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr "opciones de verificación inválidas\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: lista de auto-localización de claves inválida\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "lista de auto-localización de claves inválida\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "parámetro incorrecto para la opción \"%.50s\"\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCIÓN: ¡el programa podría volcar un fichero core!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s no permitido con %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "AVISO: ejecutándose con hora del sistema falsificada "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "no se ejecutará en memoria insegura por %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inválido\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inválido\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresión seleccionado es inválido\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificación por resumen elegido es inválido\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango de 1 a 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level inválido; debe ser 0, 1, 2, ó 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level inválido; debe ser 0, 1, 2, ó 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inválidas\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inválidas\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "preferencias personales de cifrado inválidas\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inválidas\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresión inválidas\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "tamaño de clave incorrecto; se usarán %u bits\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s aún no funciona con %s\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 #| msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "no se puede usar el cifrado '%s' en modo %s\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "no puede usar la compresión '%s' en modo %s\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicialización de la base de datos de confianza fallida: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "AVISO: se indicaron receptores (-r) sin clave pública de cifrado\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "el cifrado simétrico de '%s' falló: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "no puede usar --symmetric --encrypt en modo %s\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --sign --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "envío al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepción del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportación de clave fallida: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "exportación como clave ssh fallida: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "búsqueda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovación al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminación de armadura fallida: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creación de armadura fallida: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo de distribución inválido '%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "error al leer la especificación de clave '%s': %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "'%s' no parece ser una ID de clave, huella digital o keygrip válido\n"
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
@@ -3450,22 +3462,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:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de política de certificado inválida\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de política inválida\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es válida\n"
@@ -3478,7 +3490,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escribe información de estado en este descriptor de fichero"
 
@@ -4204,7 +4216,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "¿Seguro que todavía quiere firmarlo? (s/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
@@ -4377,8 +4389,8 @@ msgstr "He comprobado esta clave meticulosamente.\n"
 msgid "Really sign? (y/N) "
 msgstr "¿Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
@@ -4573,7 +4585,7 @@ 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:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "La clave está revocada."
 
@@ -4623,7 +4635,7 @@ msgstr "¿Borrar realmente este identificador de usuario? (s/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "¿Realmente cambiar de sitio la clave primaria? (s/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar exactamente una clave.\n"
 
@@ -4700,164 +4712,164 @@ msgstr "¿Grabar cambios? (s/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "¿Salir sin grabar? (s/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualización.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "no se puede revocar el último identificador de usuario válido\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "la revocación del identificador de usuario ha fallado: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "la configuración del ID de usuario primario ha fallado: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" no es una huella digital\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr ""
 "\"%s\" no es la huella digital primaria\n"
 "\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Identificador de usuario '%s' no válido : %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "No matching user IDs."
 msgstr "No coincide con ningún identificador de usuario."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "Nothing to sign.\n"
 msgstr "Nada que firmar.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "No está firmado por usted.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "la comprobación de la firma creada falló: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' no es una fecha de caducidad válida\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" no es una huella digital válida\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "subclave \"%s\" no encontrada\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Características: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr "Sevidor de claves no-modificar"
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr "Servidor de claves preferido: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 msgid "Notations: "
 msgstr "Notaciones: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "La siguiente clave fue revocada en %s por %s clave %s\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta clave puede ser revocada por %s clave %s"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr "(confidencial)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr "caducó: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr "num. tarjeta: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr "confianza: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr "validez: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Esta clave está deshabilitada"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4865,17 +4877,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "caducada"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4884,17 +4896,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:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "AVISO: Tu subclave de cifrado caduca pronto.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Puede que también quieras cambiar su fecha de caducidad.\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4903,72 +4915,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "¿Está seguro de querer añadirla? (s/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No puede añadir un ID fotográfico a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "¡Ese ID de usuario ya existe en esta clave!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta firma inválida? (s/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¿Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, 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:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "No se borró nada\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "inválida"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID de usuario \"%s\" compactado: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID de usuario \"%s\": ya minimizado\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID de usuario \"%s\" ya limpiado\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4977,41 +4991,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:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No puede añadir un revocador designado a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no puede elegir una clave como su propio revocador designado\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "esta clave ya ha sido designada como revocadora\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "¡AVISO: no podrá deshacer la elección de clave como revocador designado!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "¿Está seguro de querer elegir esta clave como revocador designado? (s/N) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -5019,171 +5033,171 @@ msgstr ""
 "¿Está seguro de querer cambiar la fecha de caducidad para multiples "
 "subclaves? (s/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 msgid "Changing usage of a subkey.\n"
 msgstr "Cambiando el uso de una subclave.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 msgid "Changing usage of the primary key.\n"
 msgstr "Cambiando uso de clave primaria.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "la subclave de firmado %s ya está certificada en cruz\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "la subclave %s no firma y así no necesita ser certificada en cruz\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "¿Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "¿Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 msgid "Enter the notation: "
 msgstr "Introduzca la notación: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 msgid "Proceed? (y/N) "
 msgstr "¿Continuar? (s/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hay ningún identificador de usuario con el índice %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hay ID de usuario con hash %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "No existe una subclave con ID de usuario '%s'.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con índice %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "firmada con su clave %s el %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caducó el %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¿De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "¿Crear un certificado de revocación para esta clave? (s/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Ha firmado estos IDs de usuario con la clave %s:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "¿Crear los certificados de revocación realmente? (s/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "ha intentado revocar una ID no de usuario: %s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVISO: un ID de usuario tiene fecha %d segundos en el futuro\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "No se puede revocar el último identificador de usuario válido\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, 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"
@@ -5615,6 +5629,10 @@ msgstr ""
 "Por favor no ponga la dirección de correo-e en el nombre real o en el "
 "comentario\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr "¡Ese ID de usuario ya existe en esta clave!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5934,54 +5952,54 @@ msgstr "protocolo del servidor de claves inválido (us %d!=handler %d)\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" no es un identificador de clave válido: omitido\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "renovando %d clave desde %s\n"
 msgstr[1] "renovando %d claves desde %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "clave \"%s\" no encontrada en el servidor\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "clave no encontrada en el servidor\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando clave %s de %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "ningún servidor de claves conocido\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "omitido \"%s\": %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "enviando clave %s a %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "solicitando clave de %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: imposible recuperar URI %s: %s\n"
@@ -6014,251 +6032,251 @@ msgstr "cifrado con algoritmo desconocido %d\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "frase contraseña generada con algoritmo de resumen desconocido %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr "la clave pública es %s\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "cifrado con clave de %u bits %s, ID %s, creada el %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado con clave %s, ID %s\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "AVISO: se observan varios textos en claro\n"
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu frases contraseña\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 frase contraseña\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave pública fallido: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados con la clave pública: DEK correcta\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suponiendo %s datos cifrados\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "cifrado IDEA no disponible, confiadamente intentamos usar %s en su lugar\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATENCIÓN: la intgridad del mensaje no está protegida\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCIÓN: ¡el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Atención: el remitente solicitó \"sólo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocación independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, c-format
 msgid "no signature found\n"
 msgstr "no se encontró firma\n"
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma INCORRECTA de \"%s\""
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificación de la firma\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "no puedo manejar estos datos ambiguos en la firma\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firmado el %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               usando %s clave %s\n"
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firmado el %s usando clave %s ID %s\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               emisor \"%s\"\n"
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Clave disponible en: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "ATENCIÓN: ¡Esta clave no se puede usar para firmar en modo %s!\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr ""
 "firma %s, algoritmo de resumen %s%s%s\n"
 "\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "binaria"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "desconocido"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 msgid ", key algorithm "
 msgstr ", algoritmo de clave pública "
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 "ADVERTENCIA: firma no separada; ¡el archivo %s NO ha sido verificado!\n"
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "AVISO: detectadas múltiples firmas. Sólo la primera se comprueba.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
@@ -6329,11 +6347,6 @@ msgstr "(más información: "
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opción obsoleta \"%s\"\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "ATENCIÓN: \"%s\" es una opción obsoleta\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7434,134 +7447,134 @@ msgstr "error de lectura '%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallo sincronización: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "no se puede crear el bloqueo para '%s'\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "no se puede bloquear '%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "registro base de datos de confianza %lu: escritura fallida (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "transacción en la base de datos de confianza demasiado grande\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ¡el directorio no existe!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "no se puede acceder a '%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: fallo en la creación del registro de versión: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza inválida\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "NOTA: no se puede escribir base de datos de confianza\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza inválida\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo en la creación de la tabla hash: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error actualizando el registro de versión: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error al leer registro de versión: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error escribiendo registro de versión: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: fallo lseek: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: error lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: no es una base de datos de confianza\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de versión con número de registro %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versión del fichero %d inválida\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error al leer registro libre: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error escribiendo registro de directorio: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: fallo en poner a cero un registro: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: fallo al añadir un registro: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Error: base de datos de confianza corrupta.\n"
@@ -8203,16 +8216,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%sNúmero: %s%%0ATitular: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Intentos disponibles: %d"
@@ -8254,10 +8267,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "la función de manejo del PIN devolvió un error: %s\n"
@@ -8279,121 +8292,121 @@ msgstr "El PIN para CHV%d es demasiado corto; longitud mínima %d\n"
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr "la clave ya existe\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "la clave existente será reemplazada\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr "generando nueva clave\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, c-format
 msgid "writing new key\n"
 msgstr "escribiendo clave nueva\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "la respuesta no incluye el módulo RSA\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la respuesta no incluye el exponente público RSA\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "la respuesta no incluye la clave pública EC\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "por favor, espere mientras se genera la clave ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr "la generación de la clave falló\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "generación de clave completada (%d segundo)\n"
 msgstr[1] "generación de clave completada (%d segundos)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "la respuesta no incluye la clave pública\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||Introduzca un PIN para la clave que crea firmas cualificadas."
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Por favor introduzca PIN de Administrador"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|P|Por favor introduzca PIN Unblocking Code (PUK) para claves estándar."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Por favor, introduzca PIN para claves estándar."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "falta el módulo RSA o no es de %d bits\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "falta el exponente público RSA o es mayor de %d bits\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "el PIN-Nulo no ha sido cambiado\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "el PIN-Nulo no ha sido cambiado\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Por favor introduzca un nuevo PIN para las claves estándar."
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|Introduzca nuevo PIN Unblocking Code (PUK) para claves estándar."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|Entre un nuevo PIN para la clave que crea firmas cualificadas."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8401,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:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8409,27 +8422,27 @@ msgstr ""
 "|P|Introduzca el PIN Unblocking Code (PUK) para que la clave pueda crear "
 "firmas cualificadas."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error obteniendo nuevo PIN: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "fallo al almacenar la huella digital: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo guardando la fecha de creación: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "error recuperando el estatus CHV de la tarjeta\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallo al leer clave pública: %s\n"
@@ -8437,42 +8450,42 @@ msgstr "fallo al leer clave pública: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "usando PIN por defecto %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr "fallo al usar el PIN por defecto %s: %s - en adelante deshabilitado\n"
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 msgid "||Please unlock the card"
 msgstr "||Por favor desbloquee la tarjeta"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "El PIN para CHV%d es demasiado corto; longitud mínima %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la verificación CHV%d falló: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "¡la tarjeta está bloqueada permanentemente!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8484,20 +8497,20 @@ msgstr[1] ""
 "%d intentos quedan para PIN de administrador antes de "
 "bloquearpermanentemente la clave\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "el acceso a órdenes de administrador no está configurado\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 msgid "||Please enter the PIN"
 msgstr "||Por favor introduzca PIN"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Por favor introduzca Código de Reinicio de la tarjeta"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Código de Reinicio demasiado corto; longitud mínima %d\n"
@@ -8505,79 +8518,79 @@ msgstr "Código de Reinicio demasiado corto; longitud mínima %d\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nuevo Código de Reinicio"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nuevo PIN Administrador"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr "|N|Nuevo PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Introduzca el PIN de Administrador y el Nuevo PIN de Administrador"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Por favor introduzca el PIN y el Nuevo PIN"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr "error al leer datos de la aplicación\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "error al leer huella digital DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "falta fecha de creación\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "el primo RSA %s falta o no es de %d bits\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, c-format
 msgid "unsupported curve\n"
 msgstr "curva no soportada\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "estructura de la tarjeta OpenPGP inválida (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "la huella digital en la tarjeta no coincide con la solicitada\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "la tarjeta no permite usar el algoritmo de resumen %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "actualmente se prohibe verificar el PIN del Administrador con esta orden\n"
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - ¿tarjeta OpenPGP inválida?\n"
@@ -8597,7 +8610,7 @@ msgstr "|N|Nuevo PIN Inicial"
 msgid "run in multi server mode (foreground)"
 msgstr "ejecutar en modo multi servidor (primer plano)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|poner el nivel de depurado a NIVEL"
 
@@ -8641,11 +8654,11 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "denegar órdenes de administración de la tarjeta"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Uso: @SCDAEMON@ [opciones] (-h para ayuda)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8653,22 +8666,22 @@ msgstr ""
 "Sintaxis: scdaemon [opciones] [orden [args]]\n"
 "Demonio de la tarjeta inteligente para @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "use la opción '--daemon' para ejecutar el programa en segundo plano\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "manejador del descriptor %d iniciado\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "manejador del descriptor %d terminado\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -8895,7 +8908,7 @@ msgstr "el certificado raíz no está marcado como fiable"
 msgid "checking the trust list failed: %s\n"
 msgstr "la comprobación de la lista de confianza falló: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "cadena de certificados demasiado larga\n"
@@ -8950,7 +8963,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "un hash de %u bits no vale para %u bits de la clave %s\n"
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
@@ -8996,42 +9009,42 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "no se especifica uso de la clave - asumiendo todos los usos\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "el certificado no debería haberse usado para certificar\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "el certificado no debería haberse usado para firma en respuesta OCSP\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "el certificado no debería haberse usado para cifrar\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "el certificado no debería haberse usado para firmar\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "el certificado no es utilizable para cifrar\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "el certificado no es utilizable para firmar\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9222,6 +9235,11 @@ msgstr "¿Crear un certificado auto-firmado? (s/N)"
 msgid "These parameters are used:\n"
 msgstr "Se usan estos parámetros:\n"
 
+#: sm/certreqgen-ui.c:433
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "error al crear fichero temporal: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr "Creando ahora certificado auto firmado. "
@@ -9293,103 +9311,103 @@ msgstr "borrado del certificado \"%s\" fallido: %s\n"
 msgid "no valid recipients given\n"
 msgstr "no se dieron receptores válidos\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "list external keys"
 msgstr "lista claves externas"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "list certificate chain"
 msgstr "lista de cadenas de certificados"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 msgid "import certificates"
 msgstr "importa certificado"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "export certificates"
 msgstr "exporta certificado"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr "registrar tarjeta inteligente"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr "pasar una orden a dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr "invocar gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr "|N|número de certificados que incluir"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|tomar política de información de FICHERO"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr "asumir entrada en formato PEM"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr "asumir entrada en formato base-64"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr "asumir entrada en formato binario"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 msgid "create base-64 encoded output"
 msgstr "crea una salida en base-64"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|usa ID-USUARIO como clave secreta por defecto"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|añade este anillo a la lista de anillos"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr "recuperar certificados de emisor perdidos"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|usa la codificación NOMBRE para frases contraseña PKCS#12"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr "nunca consultar una CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr "no comprobar CRLs para certificados raíz"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr "comprabar validez usando OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr "no comprobar políticas de certificados"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|usa el algoritmo de cifrado NOMBRE"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
@@ -9399,23 +9417,23 @@ msgstr "proceso por lotes: nunca preguntar"
 # Además una de las acepciones de asumir es "aceptar algo" y suponer
 # viene a ser asumir una idea como propia. Suponer "sí" en casi todas las
 # preguntas no me acaba de gustar.
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "asume \"sí\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|escribir inform de auditoría a FICHERO"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Uso: @GPGSM@ [opciones] [ficheros] (-h para ayuda)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9425,27 +9443,27 @@ msgstr ""
 "firma, comprueba, cifra o descifra usando el protocolo S/MIME\n"
 "La operación predeterminada depende de los datos de entrada\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Nota: no se podrá cifrar a '%s': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "modelo de validación desconocido '%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importando certificados comunes '%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "no puedo firmar usando '%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "orden inválida (no hay orden implícita)\n"
@@ -9475,7 +9493,7 @@ msgstr "error obteniendo parámetros almacenados: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "error importando el certificado: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "error al leer la entrada: %s\n"
@@ -9516,7 +9534,7 @@ msgstr "problema re-buscando el certificado: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "error almacenando parámetros: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Error - "
 
@@ -9888,11 +9906,6 @@ msgstr "no se puede crear el fichero de cache '%s': %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "error al cerrar '%s': %s\n"
 
-#: dirmngr/crlcache.c:948
-#, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "error al renombrar '%s' a '%s': %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
@@ -10586,92 +10599,92 @@ msgstr "los niveles de debug válidos son: %s\n"
 msgid "usage: %s [options] "
 msgstr "uso: %s [opciones] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "los dos puntos(:) no están permitidos en el nombre del socket\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "fallo al intentar descargar CRL desde '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "falló el procesamiento CRL desde '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: línea demasiado larga - omitida\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: se detectó huella digital no válida\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: error de lectura: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: ignorada la basura al final de la línea\n"
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "SIGHUP recibido - releyendo y haciendo correr las caches\n"
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 recibido - ninguna acción definida\n"
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM recibido - apagando ...\n"
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM recibido - todavía %d conexiones activas\n"
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, c-format
 msgid "shutdown forced\n"
 msgstr "apagado forzado\n"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT recibido - apagado inmediato\n"
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "señal %d recibida - ninguna acción definida\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "error mientras se accedía '%s': http status %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL '%s' redirigida a '%s' (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "demasiadas redirecciones\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11038,57 +11051,57 @@ msgstr "cadena de certificados es buena\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "el certificado no debería haberse usado para firmas CRL\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "silencioso"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr "escribir datos de salida en hexadecimal"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr "decodificar líneas de datos recibidos"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr "conecta al dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 #, fuzzy
 #| msgid "connect to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "conecta al dirmngr"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|conectar al socket Assuan NOMBRE"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|conectar al servidor Assuan en ADDR"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr "ejecutar el servidor Assuan indicando en línea de órdenes"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr "no usar el modo de conexión extendido"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|ejecuta órdenes de FICHERO al empezar"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr "ejecutar /subst al empezar"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Uso: @GPG@-connect-agent [opciones] (-h para ayuda)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -11096,49 +11109,49 @@ msgstr ""
 "Sintaxis:  @GPG@-connect-agent [opciones]\n"
 "Conectar a un agente que se está ejecutando y mandar órdenes\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "la opción \"%s\" necesita un programa y parámetros opcionales\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "la opción \"%s\" se ignora por \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "fallo recibiendo la línea: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "línea demasiado larga -omitida\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "línea acortada por culpa del caracter Nul incluído\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "orden desconocida '%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "fallo mandando la línea: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr "no hay agente dirmngr activo en esta sesión\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "error enviando opciones estándar: %s\n"
@@ -11211,12 +11224,12 @@ msgstr "Verificación externa del componente %s fallida"
 msgid "Note that group specifications are ignored\n"
 msgstr "Note que las especificación de grupo se ignoran\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "error al cerrar '%s'\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "error al leer '%s'\n"
@@ -11407,6 +11420,12 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "error escribiendo en el fichero temporal: %s\n"
+
+#~ msgid "run in supervised mode"
+#~ msgstr "ejecutar en modo supervisado"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "El nombre no puede empezar con un número\n"
 
@@ -11756,9 +11775,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "no se puede abrir %s para escribir: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "error escribiendo en %s: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "error cerrando %s: %s\n"
 
diff --git a/po/et.po b/po/et.po
index ee1fb1d..1ab5e44 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
@@ -26,52 +26,52 @@ msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "vigane parool"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -82,28 +82,28 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "liiga pikk parool\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -113,107 +113,107 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "halb parool"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "PIN too long"
 msgstr "rida on liiga pikk\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "liiga pikk parool\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Lubamatu sümbol nimes\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad PIN"
 msgstr "halb MPI"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "halb parool"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuda parooli"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/command.c:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -225,9 +225,9 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
@@ -235,15 +235,15 @@ msgstr "`%s' ei õnnestu luua: %s\n"
 
 #: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -254,137 +254,128 @@ 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:2513
+#: agent/command-ssh.c:2467
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Korrake parooli: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Korrake parooli: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Korrake parooli: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "parooli ei korratud õieti; proovige uuesti"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "parooli ei korratud õieti; proovige uuesti"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "parooli ei korratud õieti; proovige uuesti"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "viga parooli loomisel: %s\n"
-
-#: agent/genkey.c:150
+#: agent/genkey.c:154
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "kirjutan faili `%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Sisestage parool\n"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -392,7 +383,7 @@ msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "Nimes peab olema vähemalt 5 sümbolit\n"
 msgstr[1] "Nimes peab olema vähemalt 5 sümbolit\n"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -400,386 +391,385 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Kasutan seda võtit ikka? "
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Te vajate oma salajase võtme kaitsmiseks parooli.\n"
 "\n"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuda parooli"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "Võti on asendatud"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "ole mõnevõrra vaiksem"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uuenda usalduse andmebaasi"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NIMI|terminali kooditabel on NIMI"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "ei ole toetatud"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "ei ole toetatud"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|kasuta parooli moodi N"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "kasuta gpg-agenti"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud lühendi algoritm ei ole lubatud\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "loen võtmeid failist `%s'\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s ei õnnestu luua: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, 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:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: kataloogi ei õnnestu luua: %s\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2832
+#: agent/gpg-agent.c:2842
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "salajase võtme uuendamine ebaõnnestus: %s\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: jätsin vahele: %s\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
@@ -805,7 +795,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -815,7 +805,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -869,42 +859,42 @@ msgstr "Katkesta"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "viga lugemisel: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "viga lugemisel: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -917,19 +907,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "jah"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -942,7 +932,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -952,48 +942,63 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "viga `%s' lugemisel: %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 #, fuzzy
 msgid "Change passphrase"
 msgstr "muuda parooli"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1231
+#, c-format
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1741
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Kas te tõesti soovite valitud võtmeid kustutada? "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 #, fuzzy
 msgid "Delete key"
 msgstr "luba võti"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1015,7 +1020,7 @@ msgstr ""
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
@@ -1057,7 +1062,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -1119,12 +1124,12 @@ 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:905
+#: common/sysutils.c:880
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
@@ -1352,7 +1357,7 @@ msgid "algorithm: %s"
 msgstr "pakend: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1523,7 +1528,7 @@ msgstr "pakendamine ebaõnnestus: %s\n"
 msgid "iconv_open failed: %s\n"
 msgstr "faili ei õnnestu avada: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
@@ -1562,7 +1567,7 @@ msgstr "ei leia avalikku võtit %08lX: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1736,7 +1741,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
@@ -1779,7 +1784,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1807,7 +1812,7 @@ msgstr "seda ei saa teha pakettmoodis\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "See käsklus ei ole %s moodis lubatud.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "salajase võtme komponendid ei ole kättesaadavad\n"
@@ -1874,15 +1879,15 @@ msgstr "vastavat avalikku võtit pole: %s\n"
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
@@ -2230,27 +2235,27 @@ msgstr "kirjutan salajase võtme faili `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane käsklus (proovige \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "võti --output ei tööta selle käsuga\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "`%s' ei õnnestu avada\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 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,8 +2318,8 @@ msgid "subkey"
 msgstr "Avalik võti: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine ebaõnnestus: %s\n"
@@ -2377,14 +2382,14 @@ msgstr "Å¡ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "Å¡ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2407,7 +2412,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2520,12 +2525,12 @@ msgstr "kirjutan salajase võtme faili `%s'\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "võti %08lX: PGP 2.x stiilis võti - jätsin vahele\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, fuzzy, c-format
 #| msgid "error creating `%s': %s\n"
@@ -2596,297 +2601,297 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 #, fuzzy
 msgid "make a signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "krüpteeri andmed"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "krüpteerimine kasutades ainult sümmeetrilist šifrit"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "dekrüpteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "näita võtmeid"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "näita võtmeid ja allkirju"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontrolli võtmete allkirju"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "näita võtmeid ja sõrmejälgi"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "näita salajasi võtmeid"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "genereeri tühistamise sertifikaat"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "eemalda võtmed avalike võtmete hoidlast"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "eemalda võtmed salajaste võtmete hoidlast"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "allkirjasta võti"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "allkirjasta võti lokaalselt"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "genereeri uus võtmepaar"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "allkirjasta võti"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "allkirjasta võti lokaalselt"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "allkirjasta või toimeta võtit"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuda parooli"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "ekspordi võtmed"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "ekspordi võtmed võtmeserverisse"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "impordi võtmed võtmeserverist"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "otsi võtmeid võtmeserverist"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "uuenda võtmeid võtmeserverist"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "impordi/mesti võtmed"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [failid]|trüki teatelühendid"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NIMI|krüpti NIMEle"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "ära tee mingeid muutusi"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "küsi enne ülekirjutamist"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis väljund"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|määra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "impordi võtmed võtmeserverist"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "kontrolli võtmete allkirju"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "näita salajasi võtmeid"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NIMI|krüpti NIMEle"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2894,7 +2899,7 @@ msgstr ""
 "@\n"
 "(Kõikide käskude ja võtmete täieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2924,13 +2929,13 @@ msgstr ""
 " --list-keys [nimed]        näita võtmeid\n"
 " --fingerprint [nimed]      näita sõrmejälgi\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2945,7 +2950,7 @@ msgstr ""
 "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
 "vaikimisi operatsioon sõltub sisendandmetest\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2953,571 +2958,571 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Avalik võti: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Å iffer: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Räsi: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "kasuta: gpg [võtmed] "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "vastuolulised käsud\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub sümbol =\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "HOIATUS: ebaturvalised õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi õigused %s \"%s\"\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näita millisesse võtmehoidlasse näidatud võti kuulub"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste võtmete hoidlas pole\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "See käsklus ei ole %s moodis lubatud.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "MÄRKUS: %s ei ole tavapäraseks kasutamiseks!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida võtmeserveri URI\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi võtmed\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi võtmed\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path väärtuseks ei õnnestu seada %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi võtmed\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "vigased impordi võtmed\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm võib salvestada oma mälupildi!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s määrab üle %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos mõtet!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjutan salajase võtme faili `%s'\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud Å¡ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "valitud lühendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud Å¡ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi lühendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 või 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "vigane min-sert-tase; peab olema 1, 2 või 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MÄRKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 või 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku Å¡ifri eelistused\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "vigased isikliku Å¡ifri eelistused\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku lühendi eelistused\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "vigane võtme suurus; kasutan %u bitti\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei tööta veel koos %s-ga\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "Å¡ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "HOIATUS: määrati saajad (-r) aga ei kasutata avaliku võtme krüptograafiat\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "võtmeserverilt lugemine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "võtme eksport ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "võtme eksport ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "võtmeserveri otsing ebaõnnestus: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "võtmeserveri uuendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "vigane räsialgoritm `%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage nüüd oma teade ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -3531,7 +3536,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
@@ -4255,7 +4260,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
@@ -4456,8 +4461,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan tõesti? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
@@ -4671,7 +4676,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "Võti on tühistatud."
 
@@ -4724,7 +4729,7 @@ msgstr "Kas eemaldan tõesti selle kasutaja ID? "
 msgid "Really move the primary key? (y/N) "
 msgstr "Kas eemaldan tõesti selle kasutaja ID? "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Te peata valima vähemalt ühe võtme.\n"
@@ -4811,169 +4816,169 @@ msgstr "Salvestan muutused? "
 msgid "Quit without saving? (y/N) "
 msgstr "Väljun salvestamata? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Võtit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "vigane väärtus\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Tundmatu kasutaja ID.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Võtmega %08lX pole midagi allkirjastada\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   allkirjastanud %08lX %s%s\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Teatelühend: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 #, fuzzy
 msgid "Notations: "
 msgstr "Noteering: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Selle võtme võib olla tühistanud %s võti "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Selle võtme võib olla tühistanud %s võti "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei õnnestu luua: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[tühistatud] "
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "See võti on blokeeritud"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4981,19 +4986,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 #, fuzzy
 msgid "revoked"
 msgstr "[tühistatud] "
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5002,18 +5007,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:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "v3 võtme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5022,35 +5027,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Foto IDd ei saa PGP2 võtmele lisada.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas tõesti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5058,38 +5063,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Kustutatud %d allkiri.\n"
 msgstr[1] "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Kasutaja ID \"%s\" on tühistatud."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5098,41 +5103,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:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x-stiili võtmele ei saa määratud tühistajat lisada.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage määratud tühistaja kasutaja ID: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x stiilis võtit ei saa nimetada määratud tühistajaks\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "te ei saa nimetada võtit iseenda määratud tühistajaks\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "HOIATUS: See võti on määratud tühistaja poolt tühistatud!\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "HOIATUS: võtme seadmist määratud tühistajaks ei saa tagasi võtta!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5140,181 +5145,181 @@ msgid ""
 msgstr ""
 "Olete kindel, et soovite seda võtit seada määratud tühistajaks? (j/E): "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 võtme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Muudan sekundaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Muudan primaarse võtme aegumise aega.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "HOIATUS: allkirjastamise alamvõti %08lX ei ole rist-sertifitseeritud\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige täpselt üks kasutaja ID.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "jätan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Kirjutan üle (j/E)? "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka tühistada? (j/E) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale tühistamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te olete allkirjastanud järgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   tühistanud %08lX %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute tühistama järgmisi allkirju:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas tõesti loon tühistamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "salajast võtit pole\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba tühistatud\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, 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"
@@ -5741,6 +5746,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ärge palun kirjutage e-posti aadressi pärisnimesse ega kommentaari\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -6068,56 +6077,56 @@ msgstr "vigased ekspordi võtmed\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "küsin võtit %08lX võtmeserverist %s\n"
 msgstr[1] "küsin võtit %08lX võtmeserverist %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "võtit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "küsin võtit %08lX võtmeserverist %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "vigased ekspordi võtmed\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "`%s' jätsin vahele: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allkirjastatud teie võtmega %08lX %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "küsin võtit %08lX võtmeserverist %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
@@ -6150,251 +6159,251 @@ msgstr "krüpteeritud tundmatu algoritmiga %d\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "krüpteeritud tundmatu algoritmiga %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "avalik võti on %08lX\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "krüpteeritud %u-bitise %s võtmega, ID %08lX, loodud %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krüpteeritud %s võtmega, ID %08lX\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krüpteeritud kasutades %lu parooli\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "krüpteeritud ühe parooliga\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku võtmega lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku võtmega krüpteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "eeldan %s krüpteeritud andmeid\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA Å¡iffer pole saadaval, loodan kasutada selle asemel %s\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "HOIATUS: teate kooskõlalisus ei ole tagatud\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "lahtikrüpteerimine õnnestus\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: krüpteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikrüpteerimine ebaõnnestus: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "MÄRKUS: saatja nõudis \"ainult-teie-silmadele\"\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev tühistus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll jäeti ära\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neid allkirju ei õnnestu töödelda\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Allkirja lõi %.*s kasutades %s võtit ID %08lX\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Võtme leiate: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "HOIATUS: Seda võtit ei ole sertifitseeritud usaldatava allkirjaga!\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "binaarne"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "tundmatu"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "tundmatu avaliku võtme algoritm"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
@@ -6468,11 +6477,6 @@ msgstr ""
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ebasoovitav võti \"%s\"\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "HOIATUS: võtit \"%s\" ei soovitata kasutada.\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7557,134 +7561,134 @@ msgstr "viga lugemisel: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync ebaõnnestus: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "`%s' ei õnnestu luua: %s\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "`%s' ei õnnestu avada\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb kirje %lu: lseek ebaõnnestus: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "trustdb transaktsioon on liiga suur\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: kataloogi ei ole!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "`%s' ei õnnestu sulgeda: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versioonikirje loomine ei õnnestu: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: loodi vigane usalduse andmebaas\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb on loodud\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "MÄRKUS: trustdb pole kirjutatav\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: vigane trustdb\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: paisktabeli loomine ebaõnnestus: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: viga versioonikirje uuendamisel: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: viga versioonikirje lugemisel: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: viga versioonikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek ebaõnnestus: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: lugemine ebaõnnestus (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb fail\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versioonikirje kirje numbriga %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vigane faili versioon %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: viga kataloogikirje kirjutamisel: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kirje nullimine ebaõnnestus: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kirje lisamine ebaõnnestus: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: trustdb on loodud\n"
@@ -8306,16 +8310,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8350,10 +8354,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8373,158 +8377,158 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "genereeri uus võtmepaar"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "genereeri uus võtmepaar"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "eemalda võtmed avalike võtmete hoidlast"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "Võtme genereerimine ebaõnnestus: %s\n"
 msgstr[1] "Võtme genereerimine ebaõnnestus: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuda parooli"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Palun valige tühistamise põhjus:\n"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muuda parooli"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Märkus: See võti on blokeeritud.\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "muuda parooli"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Palun valige tühistamise põhjus:\n"
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB initsialiseerimine ebaõnnestus: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "võtmehoidla vahemälu uuesti loomine ebaõnnestus: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
@@ -8532,43 +8536,43 @@ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "võtmeserverile saatmine ebaõnnestus: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8576,22 +8580,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Palun valige tühistamise põhjus:\n"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8599,81 +8603,81 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "viga võtmebloki lugemisel: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "mittetoetatud URI"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s allkiri, sõnumilühendi algoritm %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
@@ -8694,7 +8698,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8743,33 +8747,33 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "vastuolulised käsud\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
@@ -9003,7 +9007,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "Loodud allkirja ei õnnestu kontrollida: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
@@ -9058,7 +9062,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -9105,42 +9109,42 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bitti %s võti, ID %08lX, loodud %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "halb sertifikaat"
@@ -9334,6 +9338,11 @@ msgstr "Loon sellele võtmele tühistamise sertifikaadi? "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:433
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "viga parooli loomisel: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9406,134 +9415,134 @@ msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "list external keys"
 msgstr "näita salajasi võtmeid"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 #, fuzzy
 msgid "list certificate chain"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 #, fuzzy
 msgid "import certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "export certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "ära kasuta terminali"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "loo ascii pakendis väljund"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase võtmena"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "lisa see võtmehoidla võtmehoidlate nimekirja"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NIMI|kasuta paroolidega Å¡ifri algoritmi NIMI"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|kasuta Å¡ifri algoritmi NIMI"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatelühendi algoritmi NIMI"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "pakettmood: ära küsi kunagi"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "eelda enamus küsimustele jah vastust"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "eelda enamus küsimustele ei vastust"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9544,27 +9553,27 @@ msgstr ""
 "allkirjasta, kontrolli, krüpti ja dekrüpti\n"
 "vaikimisi operatsioon sõltub sisendandmetest\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "ei õnnestu luua ühendust serveriga `%s': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "`%s' ei õnnestu sulgeda: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9594,7 +9603,7 @@ msgstr "viga parooli loomisel: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -9634,7 +9643,7 @@ msgstr "rev? probleem tühistamise kontrollimisel: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -10001,12 +10010,6 @@ msgstr "kataloogi `%s' ei õnnestu luua: %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/crlcache.c:948
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "viga `%s' lugemisel: %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
@@ -10694,93 +10697,93 @@ msgstr ""
 msgid "usage: %s [options] "
 msgstr "kasuta: gpg [võtmed] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "pakendamine ebaõnnestus: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "rida on liiga pikk\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "viga: vigane sõrmejälg\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "viga lugemisel: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "ei töödeldud"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "liiga palju `%c' eelistusi\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11151,105 +11154,105 @@ msgstr "eelistus %c%lu on duplikaat\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "välju"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Kasuta: gpg [võtmed] [failid] (-h näitab abiinfot)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "võtmebloki kustutamine ebaõnnestus: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "rida on liiga pikk\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "allkirjastamine ebaõnnestus: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
@@ -11315,12 +11318,12 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -11510,6 +11513,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "kirjutan faili `%s'\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "Võti on asendatud"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Nimi ei või alata numbriga\n"
 
@@ -11771,10 +11783,6 @@ msgstr ""
 #~ msgstr "%s ei õnnestu avada: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "viga võtmehoidlasse `%s' kirjutamisel: %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "viga `%s' lugemisel: %s\n"
 
diff --git a/po/fi.po b/po/fi.po
index 4e0124a..43d2d93 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -31,7 +31,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
@@ -42,52 +42,52 @@ msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -98,28 +98,28 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "salasana on liian pitkä\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -129,107 +129,107 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "PIN too long"
 msgstr "rivi on liian pitkä\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "salasana on liian pitkä\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI ei kelpaa"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "väärä salasana"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/command.c:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -241,9 +241,9 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
@@ -251,15 +251,15 @@ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
 #: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -270,137 +270,128 @@ 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:2513
+#: agent/command-ssh.c:2467
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Toista salasana: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Toista salasana: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Toista salasana: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "virhe luotaessa salasanaa: %s\n"
-
-#: agent/genkey.c:150
+#: agent/genkey.c:154
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "kirjoitetaan kohteeseen \"%s\"\n"
+msgid "error writing to pipe: %s\n"
+msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Syötä salasana\n"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -408,7 +399,7 @@ msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
 msgstr[1] "Nimen täytyy olla vähintään 5 merkkiä pitkä\n"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -416,387 +407,386 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Haluatko käyttää tätä avainta kaikesta huolimatta? "
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "Avain on uusittu"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "monisanainen"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "päivitä luottamustietokanta"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NIMI|aseta päätteen merkistöksi NIMI"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "ei tuettu"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "ei tuettu"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|käytä salasanoissa toimintatapaa N"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "käytä gpg-agentia"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, 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:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, 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:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: hakemistoa ei voi luoda: %s\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2832
+#: agent/gpg-agent.c:2842
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
@@ -822,7 +812,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -832,7 +822,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -886,42 +876,42 @@ msgstr "Peru"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "lukuvirhe: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "lukuvirhe: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -934,19 +924,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "kyllä|kylla|joo"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -959,7 +949,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -969,48 +959,63 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 #, fuzzy
 msgid "Change passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1231
+#, c-format
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1741
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 #, fuzzy
 msgid "Delete key"
 msgstr "ota avain käyttöön"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1032,7 +1037,7 @@ msgstr ""
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
@@ -1074,7 +1079,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -1136,12 +1141,12 @@ 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:905
+#: common/sysutils.c:880
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
@@ -1369,7 +1374,7 @@ msgid "algorithm: %s"
 msgstr "ascii-koodaus: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1540,7 +1545,7 @@ msgstr "ascii-koodaaminen epäonnistui: %s\n"
 msgid "iconv_open failed: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
@@ -1579,7 +1584,7 @@ msgstr "julkista avainta %08lX ei löydy: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1755,7 +1760,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
@@ -1798,7 +1803,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1826,7 +1831,7 @@ msgstr "tätä ei voi tehdä eräajossa\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
@@ -1893,15 +1898,15 @@ msgstr "ei vastaavaa julkista avainta: %s\n"
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
@@ -2249,27 +2254,27 @@ msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2332,8 +2337,8 @@ msgid "subkey"
 msgstr "JulkAvain: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
@@ -2396,14 +2401,14 @@ msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2425,7 +2430,7 @@ msgstr "valittu symmetrinen salain %s (%d) ei ole vastaanottajan suosima\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2536,12 +2541,12 @@ msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "avain %08lX: PGP 2.x -muodon avain - ohitetaan\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "VAROITUS: mitään ei viety\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, fuzzy, c-format
 #| msgid "error creating `%s': %s\n"
@@ -2612,297 +2617,297 @@ msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 #, fuzzy
 msgid "make a signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "näytä avaimet"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "näytä avaimet allekirjoituksineen"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten renkaasta"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "allekirjoita tai muokkaa avainta"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "päivitä kaikki avaimet avainpalvelimelta"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "nouda/liitä avaimia"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "kysy ennen ylikirjoittamista"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2911,7 +2916,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2940,13 +2945,13 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2961,7 +2966,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2969,572 +2974,572 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth tulee olla välillä 1-255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -3548,7 +3553,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
@@ -4277,7 +4282,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  Allekirjoittaminen ei onnistu.\n"
 
@@ -4479,8 +4484,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
@@ -4694,7 +4699,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "Avain on mitätöity."
 
@@ -4747,7 +4752,7 @@ msgstr "Varmastiko poista tämä käyttäjätunnus? "
 msgid "Really move the primary key? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
@@ -4834,169 +4839,169 @@ msgstr "Tallenna muutokset? "
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Käyttäjätunnusta ei löydy.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Avaimelle %08lX ei löydy mitään mitä allekirjoittaa\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   %08lX allekirjoitti tämän %s%s\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaatio: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x -muodon käyttäjätunnukselle ei ole valintoja.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5004,19 +5009,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5025,18 +5030,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:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5045,35 +5050,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5081,38 +5086,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d allekirjoitus poistettu.\n"
 msgstr[1] "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5122,41 +5127,41 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Et voi lisätä määrättyä mitätöijää PGP 2.x -muodon avaimeen.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROITUS: avaimen nimittämistä määrätyksi mitätöijäksi ei voi perua!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5164,183 +5169,183 @@ msgid ""
 msgstr ""
 "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   %08lX allekirjoitti tämän %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   %08lX mitätöi tämän %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VAROITUS: käyttäjätunnuksen allekirjoitus on päivätty %d sekuntin päähän "
 "tulevaisuuteen\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5771,6 +5776,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -6101,56 +6110,56 @@ msgstr "virheelliset vientivalitsimet\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "pyydetään avainta %08lX kohteesta %s\n"
 msgstr[1] "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ohitetaan \"%s\": %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allekirjoitettu avaimellasi %08lX %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
@@ -6183,245 +6192,245 @@ msgstr "salattu tuntemattomalla algoritmilla %d\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "julkinen avain on %08lX\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "salattu %u-bittisella %s-avaimella, tunnus %08lX, luotu %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "salattu %s-avaimella, tunnus %08lX\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "salattu %lu salasanalla\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "salattu yhdellä salasanalla\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "julkisen avaimen avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "oletettavasti %s-salattua dataa\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA-salain ei käytettävissä, yritetään optimistisesti \n"
 "käyttää sen sijaan salainta %s\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "avaus onnistui\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROITUS: salattua viestiä on muokattu!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "HUOM: lähettäjä määrittää \"vain-sinun-silmillesi\"\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "itsenäinen mitätöinti - käytä \"gpg --import\" ottaaksesi käyttöön\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vanhentunut allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "näitä allekirjoituksia ei voi käsitellä\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 "Allekirjoitus tehty %.*s käyttämällä %s-algoritmia avaintunnuksella %08lX\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[ei tiedossa]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 "VAROITUS: Tätä avainta ei ole varmennettu luotettavalla allekirjoituksella!\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "binääri"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "tuntematon "
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "tuntematon julkisen avaimen algoritmi"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "allekirjoitus ei ole erillinen\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
@@ -6429,12 +6438,12 @@ msgstr ""
 "VAROITUS: useita allekirjoituksia havaittu.  Vain ensimmäisen voi "
 "tarkistaa.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
@@ -6511,11 +6520,6 @@ msgstr ""
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7618,134 +7622,134 @@ msgstr "lukuvirhe: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synkronointi epäonnistui: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek epäonnistui: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: kirjoittaminen epäonnistuin (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "trustdb-tapahtuma on liian suuri\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: hakemistoa ei ole olemassa!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: versiotietueen luonti epäonnistui: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: luotu trustdb ei kelpaa\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb luotu\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "HUOM: trustdb:n ei voida kirjoittaa\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb ei kelpaa\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: virhe päivitettäessä versiotietuetta: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: virhe luettaessa versiotietuetta: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: virhe kirjoitettaessa versiotietuetta: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek epäonnistui: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ei ole trustdb-tiedosto\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versiotietue tietuenumerolla %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: tiedostoversio %d ei kelpaa\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: virhe kirjoitettaessa hakemistotietuetta: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: tietueen nollaaminen epäonnistui: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: tietueeseen lisääminen epäonnistui: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: trustdb luotu\n"
@@ -8368,16 +8372,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8412,10 +8416,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8435,158 +8439,158 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "luo uusi avainpari"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "luo uusi avainpari"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "Avaimen luonti epäonnistui: %s\n"
 msgstr[1] "Avaimen luonti epäonnistui: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muuta salasanaa"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Huom: Tämä avain on poistettu käytöstä\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "muuta salasanaa"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
@@ -8594,43 +8598,43 @@ msgstr "avainlohkojen poisto epäonnistui: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8638,22 +8642,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8661,82 +8665,82 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI-muotoa ei tueta"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@ -8757,7 +8761,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8806,33 +8810,33 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "ristiriitainen komento\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
@@ -9066,7 +9070,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
@@ -9121,7 +9125,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -9168,42 +9172,42 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "virheellinen varmenne"
@@ -9397,6 +9401,11 @@ msgstr "Luo tälle avaimelle mitätöintivarmenne? "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:433
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "virhe luotaessa salasanaa: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9469,134 +9478,134 @@ msgstr "avainlohkojen poisto epäonnistui: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "list external keys"
 msgstr "näytä salaiset avaimet"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 #, fuzzy
 msgid "list certificate chain"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 #, fuzzy
 msgid "import certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "export certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "älä käytä lainkaan päätettä"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NIMI|käytä salasanoihin salausalgoritmia NIMI"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|käytä salausalgoritmia NIMI"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "eräajo: älä kysy mitään"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9607,27 +9616,27 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9657,7 +9666,7 @@ msgstr "virhe luotaessa salasanaa: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -9697,7 +9706,7 @@ msgstr "rev? mitätöinnin tarkistuksessa ongelmia: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -10066,12 +10075,6 @@ msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/crlcache.c:948
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
@@ -10761,93 +10764,93 @@ msgstr ""
 msgid "usage: %s [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "rivi on liian pitkä\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "lukuvirhe: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "ei käsitelty"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "liian monta \"%c\" valintaa\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11218,105 +11221,105 @@ msgstr "valinta %c%lu on kopio\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "lopeta|sulje"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "rivi on liian pitkä\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
@@ -11382,12 +11385,12 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -11577,6 +11580,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "kirjoitetaan kohteeseen \"%s\"\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "Avain on uusittu"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Nimi ei voi alkaa numerolla\n"
 
@@ -11838,10 +11850,6 @@ msgstr ""
 #~ msgstr "tiedostoa %s ei voi avata: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
diff --git a/po/fr.gmo b/po/fr.gmo
index 6f4a03f..9413e39 100644
--- a/po/fr.gmo
+++ b/po/fr.gmo
diff --git a/po/fr.po b/po/fr.po
index 7049ab3..a6c4d81 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2017-11-02 17:40+0100\n"
 "Last-Translator: David Prévot <david@tilapin.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Lokalize 1.5\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "impossible d'obtenir le verrou pinentry : %s\n"
@@ -29,60 +29,60 @@ msgstr "impossible d'obtenir le verrou pinentry : %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Annuler"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|Code personnel :"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 #| msgid "|pinentry-label|_Cancel"
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Annuler"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, fuzzy
 #| msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr ""
 "Voulez-vous vraiment supprimer de façon permanente la clef secrète OpenPGP :"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "phrase de passe incorrecte"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -93,7 +93,7 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -104,14 +104,14 @@ msgstr ""
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -119,7 +119,7 @@ msgstr "Phrase secrète trop longue"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Qualité :"
 
@@ -129,13 +129,13 @@ msgstr "Qualité :"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "La qualité du texte entré ci-dessus.\n"
 "Veuillez demander à votre administrateur des précisions sur les critères."
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -143,7 +143,7 @@ msgstr ""
 "Veuillez entrer votre code personnel, afin de débloquer la clef secrète "
 "pendant cette session"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -151,76 +151,76 @@ msgstr ""
 "Veuillez entrer votre phrase secrète, afin de débloquer la clef secrète "
 "pendant cette session"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Phrase secrète :"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "ne correspond pas — veuillez réessayer"
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (essai %d sur %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr "Répéter :"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 msgid "PIN too long"
 msgstr "Code personnel trop long"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 msgid "Passphrase too long"
 msgstr "Phrase secrète trop longue"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 msgid "Invalid characters in PIN"
 msgstr "Caractères incorrects dans le code personnel"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr "Code personnel trop court"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad PIN"
 msgstr "Mauvais code personnel"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad Passphrase"
 msgstr "Mauvaise phrase secrète"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Veuillez répéter cette phrase secrète"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, 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:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -244,24 +244,24 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "les clefs SSH plus grandes que %d bits ne sont pas prises en charge\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, 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
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, 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:2513
+#: agent/command-ssh.c:2467
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting list of cards: %s\n"
 msgstr "erreur de lecture des options stockées : %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, 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:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Autoriser"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Refuser"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Veuillez entrer la phrase secrète pour la clef SSH%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -308,85 +308,77 @@ 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:3708
+#: agent/command-ssh.c:3797
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "échec de création du flux à partir de cette socket : %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Veuillez insérer la carte de numéro de série"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "Code personnel d'administration"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "CDP"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Code de réinitialisation"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0AUtilisez le pavé numérique du lecteur en entrée."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Répétez ce code de réinitialisation"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Répétez ce code de déblocage personnel"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Répétez ce code personnel"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr ""
 "les codes de réinitialisation ne correspondent pas ; veuillez réessayer"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr ""
 "les codes de déblocage personnels ne correspondent pas ; veuillez réessayer"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "Les codes personnels ne correspondent pas ; veuillez réessayer"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Veuillez entrer le code personnel%s%s%s pour déverrouiller la carte"
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "erreur de création du fichier temporaire : %s\n"
-
-#: agent/genkey.c:150
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "erreur d'écriture du fichier temporaire : %s\n"
+#: agent/genkey.c:154
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "erreur d'écriture sur %s : %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 msgid "Enter new passphrase"
 msgstr "Entrez la nouvelle phrase secrète"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
@@ -394,7 +386,7 @@ msgstr ""
 "Aucune phrase secrète n'a été entrée.%0AUne phrase secrète vide n'est pas "
 "autorisée."
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -403,18 +395,18 @@ msgstr ""
 "Aucune phrase secrète n'a été entrée — c'est souvent une mauvaise idée."
 "%0AVeuillez confirmer que vous ne voulez aucune protection pour la clef."
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr "Oui, aucune protection n'est nécessaire"
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "Une phrase secrète devrait contenir au moins %u caractère."
 msgstr[1] "Une phrase secrète devrait contenir au moins %u caractères."
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -426,7 +418,7 @@ msgstr[1] ""
 "Une phrase secrète devrait contenir au moins %u chiffres%%0Aou caractères "
 "spéciaux."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, fuzzy, c-format
 #| msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
@@ -434,227 +426,221 @@ msgstr ""
 "Une phrase secrète ne devrait ni être un mot commun,%%0Ani correspondre à un "
 "certain schéma."
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Avertissement : une phrase secrète non sécurisée a été entrée."
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 msgid "Take this one anyway"
 msgstr "La prendre quand même"
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Veuillez entrer la phrase secrète%0Apour protéger la nouvelle clef"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 msgid "Please enter the new passphrase"
 msgstr "Veuillez entrer la nouvelle phrase secrète"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Options pratiques pour le débogage"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr "exécuter en mode démon (arrière-plan)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr "exécuter en mode serveur (premier plan)"
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-#, fuzzy
-#| msgid "run in server mode"
-msgid "run in supervised mode"
-msgstr "exécuter en mode serveur"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr "ne pas détacher de la console"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr "sortie de commandes à la sh"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr "sortie de commandes à la csh"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 msgid "|FILE|read options from FILE"
 msgstr "|FICHIER|lire les options depuis le FICHIER"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr "Options contrôlant la sortie de diagnostique"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "bavard"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FICHIER|écrire les journaux serveur dans le FICHIER"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr "Options contrôlant la configuration"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "ne pas utiliser le SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PROG|utiliser PROG comme SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PROG|utiliser PROG comme SCdaemon"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|connect to host NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NOM|se connecter à l'hôte NOM"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignorer les demandes de modification du TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignorer les demandes de modification d'aff. X"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "activer la prise en charge de SSH"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "activer la prise en charge de putty"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 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:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|oublier les codes personnels après N secondes"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|oublier les clefs SSH après N secondes"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|définir la durée maximale du cache de code personnel à N secondes"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|définir la durée maximale du cache de clef SSH à N secondes"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr "ne pas utiliser le cache de code pour signer"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 #, fuzzy
 #| msgid "do not allow the reuse of old passphrases"
 msgid "disallow the use of an external password cache"
 msgstr "ne pas autoriser la réutilisation d'anciennes phrases secrètes"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "ne pas marquer les clefs comme de confiance"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 msgid "allow presetting passphrase"
 msgstr "permettre de préconfigurer la phrase secrète"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr "Options d'application d'une politique de phrase secrète"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr "pas de contournement de politique de phrase secrète"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|définir la taille minimale des nouvelles phrases secrètes à N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 "|N|nécessiter au moins N caractères non alphabétiques pour les nouvelles "
 "phrases secrètes"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 "|FICHIER|vérifier la nouvelle phrase secrète par rapport aux motifs du "
 "FICHIER"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|la phrase secrète expire après N jours"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 msgid "do not allow the reuse of old passphrases"
 msgstr "ne pas autoriser la réutilisation d'anciennes phrases secrètes"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Options contrôlant la sécurité"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "ne pas capturer le clavier et la souris"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PROG|utiliser PROG pour entrer le code personnel"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 #, fuzzy
 #| msgid "|N|set LDAP timeout to N seconds"
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|définir le temps d'expiration de LDAP à N secondes"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
@@ -662,21 +648,21 @@ msgstr ""
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Veuillez signaler toutes anomalies sur <@EMAIL@> (en anglais)\n"
 "et tout problème de traduction à <traduc@traduc.org>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Utilisation : dirmngr @GPG_AGENT@ (-h pour l'aide)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -684,134 +670,139 @@ msgstr ""
 "Syntaxe : @GPG_AGENT@ [options] [commande [arguments]]\n"
 "Gestionnaire de clefs secrètes pour @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "niveau de débogage « %s » incorrect\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage sélectionnée est incorrecte\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "lecture des options de « %s »\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "Attention : « %s » est une option déconseillée\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossible de créer la socket : %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, 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:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "erreur de lecture du « nonce » de la socket\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "erreur de lien de la socket à « %s » : %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, 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:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "écoute sur la socket « %s »\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, 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:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "répertoire « %s » créé\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "échec de stat() pour « %s » : %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, 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:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, 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:2747
+#: agent/gpg-agent.c:2757
 #, 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:2752
+#: agent/gpg-agent.c:2762
 #, 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:2827
+#: agent/gpg-agent.c:2837
 #, 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:2832
+#: agent/gpg-agent.c:2842
 #, 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:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "échec de npth_pselect : %s — attente 1 s\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s arrêté\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr ""
@@ -838,7 +829,7 @@ msgstr ""
 "Syntaxe : gpg-preset-passphrase [options] KEYGRIP\n"
 "Maintenance du cache des mots de passe\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -848,7 +839,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -905,42 +896,42 @@ msgstr "annulé\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erreur de demande de la phrase secrète : %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "erreur d'ouverture de « %s » : %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "fichier « %s », ligne %d : %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "déclaration « %s » ignorée dans « %s », ligne %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "le système de liste de confiance « %s » n'est pas disponible\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "mauvaise empreinte dans « %s », ligne %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "option de clef incorrecte dans « %s », ligne %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "erreur de lecture de « %s », ligne %d : %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "erreur de lecture de la liste de certificats racine de confiance\n"
@@ -953,7 +944,7 @@ msgstr "erreur de lecture de la liste de certificats racine de confiance\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -962,11 +953,11 @@ msgstr ""
 "Attribuez-vous une confiance ultime%%0A  « %s »%%0Apour certifier "
 "correctement les certificats de l'utilisateur ?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 msgid "Yes"
 msgstr "Oui"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr "Non"
@@ -979,7 +970,7 @@ msgstr "Non"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -991,22 +982,27 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr "Exact"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr "Faux"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "erreur en renommant « %s » en « %s » : %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Remarque : cette phrase secrète n'a jamais été modifiée.%0AVeuillez la "
 "modifier maintenant."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -1015,15 +1011,29 @@ msgstr ""
 "Cette phrase secrète n'a pas été modifiée%%0Adepuis le %.4s-%.2s-%.2s. "
 "Veuillez la modifier maintenant."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 msgid "Change passphrase"
 msgstr "Modifier la phrase secrète"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr "Je la modifierai plus tard"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr "Veuillez insérer la carte de numéro de série"
+
+#: 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?"
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+"Un processus SSH demande à utiliser la clef%%0A  %s%%0A  (%s)%%0AVoulez-vous "
+"l'autoriser ?"
+
+#: agent/findkey.c:1741
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -1031,11 +1041,11 @@ msgid ""
 "%%0A?"
 msgstr "Voulez-vous vraiment supprimer les clefs sélectionnées ? (o/N) "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 msgid "Delete key"
 msgstr "Supprimer la clef"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1062,7 +1072,7 @@ msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 "un hachage de %1$zu bits n'est pas valable pour une clef %3$s de %2$u bits\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "échec de vérification de la signature créée : %s\n"
@@ -1102,7 +1112,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "erreur de création de processus fils : %s\n"
@@ -1164,13 +1174,13 @@ 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:905
+#: common/sysutils.c:880
 #, fuzzy, c-format
 #| msgid "waiting for the agent to come up ... (%ds)\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "attente pour permettre à l'agent d'arriver… (%d s)\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "impossible de renommer « %s » en « %s » : %s\n"
@@ -1393,7 +1403,7 @@ msgid "algorithm: %s"
 msgstr "algorithme : %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "algorithme non pris en charge : %s"
@@ -1548,7 +1558,7 @@ msgstr "conversion de « %s » vers « %s » non disponible\n"
 msgid "iconv_open failed: %s\n"
 msgstr "échec de iconv_open : %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "impossible de convertir « %s » en « %s » : %s\n"
@@ -1587,7 +1597,7 @@ msgstr "verrou « %s » non effectif : %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "attente du verrou %s…\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s est trop ancien (nécessaire : %s, utilisé : %s)\n"
@@ -1764,7 +1774,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
@@ -1811,7 +1821,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "générer un certificat de révocation"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1839,7 +1849,7 @@ msgstr "impossible de faire cela en mode automatique\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Cette commande n'est disponible que pour les cartes en version 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "le code de réinitialisation n'est plus disponible\n"
@@ -1904,14 +1914,14 @@ msgstr "URL pour récupérer la clef publique : "
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "erreur de lecture de « %s » : %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
@@ -2275,26 +2285,26 @@ msgstr "Les commandes d'administration ne sont pas permises\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande incorrecte (essayez « help »)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "impossible d'ouvrir « %s »\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clef « %s » introuvable : %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2354,8 +2364,8 @@ msgid "subkey"
 msgstr "sous-clef"
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "échec de la mise à jour : %s\n"
@@ -2418,15 +2428,15 @@ msgstr "impossible d'utiliser l'algorithme de chiffrement « %s » en mode %s.
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, fuzzy, c-format
 #| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "impossible d'utiliser l'algorithme de chiffrement « %s » en mode %s.\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2451,7 +2461,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "Attention : « %s%s » est une option obsolète — non prise en compte\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2558,12 +2568,12 @@ msgstr "il est interdit d'exporter les clefs secrètes\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "clef %s : clef de type PGP 2.x — ignorée\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "Attention : rien n'a été exporté\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, c-format
 msgid "error creating '%s': %s\n"
@@ -2634,292 +2644,292 @@ msgstr ""
 "utilisation de la sous-clef %s à la place de la clef\n"
 "principale %s\n"
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
 msgstr "argument incorrect pour l'option « %.50s »\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 msgid "make a signature"
 msgstr "faire une signature"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "make a clear text signature"
 msgstr "faire une signature en texte clair"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "faire une signature détachée"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "chiffrer les données"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement symétrique seulement"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "déchiffrer les données (défaut)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "vérifier une signature"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "afficher les clefs"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "afficher les clefs et les signatures"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr "afficher et vérifier les signatures de clefs"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "afficher les clefs et les empreintes"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "afficher les clefs secrètes"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "générer une nouvelle paire de clefs"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 msgid "quickly generate a new key pair"
 msgstr "générer rapidement une nouvelle paire de clefs"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "générer rapidement une nouvelle paire de clefs"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "générer rapidement une nouvelle paire de clefs"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "générer rapidement une nouvelle paire de clefs"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr "générer une paire de clefs complètes"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "générer un certificat de révocation"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "supprimer les clefs du porte-clefs public"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "supprimer les clefs du porte-clefs secret"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "quickly sign a key"
 msgstr "signer rapidement une clef"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "quickly sign a key locally"
 msgstr "signer rapidement une clef localement"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "générer rapidement une nouvelle paire de clefs"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "signer une clef"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "signer une clef localement"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "signer ou éditer une clef"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "modifier une phrase secrète"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "exporter les clefs"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "exporter les clefs vers un serveur de clefs"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "importer les clefs d'un serveur de clefs"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "chercher les clefs avec un serveur de clefs"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "mettre à jour les clefs depuis un serveur"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "importer ou fusionner les clefs"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr "afficher l'état de la carte"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr "modifier les données d'une carte"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr "modifier le code personnel d'une carte"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "mettre la base de confiance à jour"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid "print message digests"
 msgstr "indiquer les fonctions de hachage"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "exécuter en mode serveur"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser le NOM comme clef secrète par défaut"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOM|chiffrer aussi pour l'identité NOM"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|configurer les alias d'adresse"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr "utiliser le comportement strict d'OpenPGP"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "ne rien modifier"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "demander avant d'écraser un fichier"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 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:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 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:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "créer une sortie ASCII avec armure"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 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:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|niveau de compression N (0 désactive)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 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:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MÉCANISMES|utiliser les MÉCANISMES pour localiser les clefs"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importer les clefs d'un serveur de clefs"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "afficher et vérifier les signatures de clefs"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "désactiver tous les accès au dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "Options contrôlant la configuration"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "afficher les clefs secrètes"
 
 # NOTE: Extra initial space to realign the output (maybe wchar issue)
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|IDENTITÉ| chiffrer pour l'IDENTITÉ"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|IDENTITÉ| utiliser l'IDENTITÉ pour signer ou déchiffrer"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2928,7 +2938,7 @@ msgstr ""
 "(Consultez la page de manuel pour obtenir une liste complète des commandes\n"
 "et options)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2958,11 +2968,11 @@ msgstr ""
 " --list-keys [noms]         montrer les clefs\n"
 " --fingerprint [noms]       montrer les empreintes\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Utilisation : @GPG@ [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2972,7 +2982,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:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2980,87 +2990,87 @@ msgstr ""
 "\n"
 "Algorithmes pris en charge :\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Clef publique : "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Chiffrement : "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Hachage : "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Compression : "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "utilisation : %s [options] %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "aucun signe = trouvé dans la définition du groupe « %s »\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr ""
 "Attention : le propriétaire du répertoire personnel « %s »\n"
 "            n'est pas sûr\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr ""
 "Attention : le propriétaire du fichier de configuration « %s »\n"
 "            n'est pas sûr\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr ""
 "Attention : le propriétaire de l'extension « %s »\n"
 "            n'est pas sûr\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr ""
 "Attention : les droits du répertoire personnel « %s »\n"
 "            ne sont pas sûrs\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 "Attention : les droits du fichier de configuration « %s »\n"
 "            ne sont pas sûrs\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr ""
 "Attention : les droits de l'extension « %s »\n"
 "            ne sont pas sûrs\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "Attention : le propriétaire du répertoire contenant le répertoire personnel\n"
 "            « %s » n'est pas sûr\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -3068,21 +3078,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:1737
+#: g10/gpg.c:1738
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "Attention : le propriétaire du répertoire contenant l'extension\n"
 "            « %s » n'est pas sûr\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "Attention : les droits du répertoire contenant le répertoire personnel\n"
 "            « %s » ne sont pas sûrs\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -3090,488 +3100,488 @@ msgstr ""
 "Attention : les droits du répertoire contenant le fichier de configuration\n"
 "            « %s » ne sont pas sûrs\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "Attention : les droits du répertoire contenant l'extension\n"
 "            « %s » ne sont pas sûrs\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "élément de configuration « %s » inconnu\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr "montrer les photos d'identité en affichant les clefs"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 msgid "show key usage information during key listings"
 msgstr "indiquer les informations sur l'utilisation en affichant les clefs"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr "montrer les URL de politique en affichant les signatures"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 msgid "show all notations during signature listings"
 msgstr "montrer toutes les notations en affichant les signatures"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr "utiliser les notations aux normes IETF en affichant les signatures"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "utiliser les notations fournies par l'utilisateur en affichant les signatures"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "montrer les URL des serveurs de clefs favoris en affichant les signatures"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr "indiquer la validité de l'identité en affichant les clefs"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr "montrer les identités révoquées et expirées en affichant les clefs"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr "indiquer les sous-clefs révoquées et expirées en affichant les clefs"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 msgid "show the keyring name in key listings"
 msgstr "montrer le nom du porte-clefs en affichant les clefs"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 msgid "show expiration dates during signature listings"
 msgstr "montrer les dates d'expiration en affichant les signatures"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, fuzzy, c-format
 #| msgid "unknown option '%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "option « %s » inconnue\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Cette commande n'est pas permise en mode %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Remarque : %s n'est pas pour une utilisation normale.\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "« %s » n'est pas une date d'expiration de signature valable\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 #| msgid "line %d: not a valid email address\n"
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "ligne %d : ce n'est pas une adresse électronique valable\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "mode pinentry « %s » incorrect\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 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:3314
+#: g10/gpg.c:3315
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "« %s » n'est pas un jeu de caractères valable\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'analyser l'URL du serveur de clefs\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s : %d : les options du serveur de clefs sont incorrectes\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de clefs sont incorrectes\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s : %d : options d'importation incorrectes\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "options d'importation incorrectes\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "options de liste incorrectes\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s : %d : options d'exportation incorrectes\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "options d'exportation incorrectes\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s : %d : options de liste incorrectes\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr "options de liste incorrectes\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr "montrer les photos d'identité en vérifiant les signatures"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr "montrer les URL de politique en vérifiant les signatures"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 msgid "show all notations during signature verification"
 msgstr "montrer toutes les notations en vérifiant les signatures"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr "utiliser les notations aux normes IETF en vérifiant les signatures"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 "utiliser les notations fournies par l'utilisateur en vérifiant les signatures"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "montrer les URL des serveurs de clefs favoris en vérifiant les signatures"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 msgid "show user ID validity during signature verification"
 msgstr "indiquer la validité de l'identité en vérifiant les signatures"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "montrer les identités révoquées et expirées en vérifiant les signatures"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 msgid "show only the primary user ID in signature verification"
 msgstr "ne montrer que l'identité principale en vérifiant les signatures"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s : %d : options de vérification incorrectes\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr "options de vérification incorrectes\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de configurer le chemin d'exécution à %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s : %d : liste de recherche automatique de clef incorrecte\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "liste de recherche automatique de clef incorrecte\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "argument incorrect pour l'option « %.50s »\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "Attention : le programme pourrait créer un fichier « core ».\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "Attention : %s remplace %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s.\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s.\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "Attention : exécution avec un système de temps contrefait : "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "ne sera pas exécuté avec une mémoire non sécurisée à cause de %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement sélectionné est incorrect\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "la fonction de hachage sélectionnée est incorrecte\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression sélectionné est incorrect\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification sélectionnée est incorrecte\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "« completes-needed » doit être supérieur à 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "« marginals-needed » doit être supérieur à 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "« max-cert-depth » doit être compris entre 1 et 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "« default-cert-level » incorrect ; doit être 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "« min-cert-level » incorrect ; doit être , 1, 2 ou 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Remarque : le mode S2K simple (0) est fortement déconseillé\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K incorrect ; doit être 0, 1 ou 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "préférences par défaut incorrectes\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "préférences personnelles de chiffrement incorrectes\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "préférences personnelles de chiffrement incorrectes\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "préférences personnelles de hachage incorrectes\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "préférences personnelles de compression incorrectes\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "taille incorrecte ; utilisation de %u bits\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne fonctionne pas encore avec %s\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 #| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "impossible d'utiliser l'algorithme de chiffrement « %s » en mode %s.\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, fuzzy, c-format
 #| msgid "you may not use compression algorithm '%s' while in %s mode\n"
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "impossible d'utiliser l'algorithme de compression « %s » en mode %s.\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance : %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Attention : les destinataires (-r) indiqués n'utilisent pas\n"
 "            de clef publique pour le chiffrement\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "échec du chiffrement symétrique de « %s » : %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "impossible d'utiliser --symmetric --encrypt avec --s2k-mode 0\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "impossible d'utiliser --symmetric --encrypt en mode %s\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "impossible d'utiliser --symmetric --sign --encrypt avec --s2k-mode 0\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "impossible d'utiliser --symmetric --sign --encrypt en mode %s\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "échec d'envoi vers le serveur de clefs : %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "échec de réception depuis le serveur de clefs : %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "échec d'exportation de la clef : %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "échec d'exportation de la clef : %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "échec de recherche au sein du serveur de clefs : %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "échec de rafraîchissement par le serveur de clefs : %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "échec de déconstruction d'une armure : %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "échec de construction d'une armure : %s \n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algorithme de hachage « %s » incorrect\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, fuzzy, c-format
 #| msgid "error loading certificate '%s': %s\n"
 msgid "error parsing key specification '%s': %s\n"
 msgstr "erreur de chargement du certificat « %s » : %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message…\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donnée est incorrecte\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donnée est incorrecte\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, 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"
@@ -3584,7 +3594,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|écrire l'état sur ce descripteur"
 
@@ -4323,7 +4333,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voulez-vous vraiment toujours la signer ? (o/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr " Impossible de signer.\n"
 
@@ -4497,8 +4507,8 @@ msgstr "J'ai complètement vérifié cette clef.\n"
 msgid "Really sign? (y/N) "
 msgstr "Voulez-vous vraiment signer ? (o/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "échec de la signature : %s\n"
@@ -4705,7 +4715,7 @@ 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:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "La clef est révoquée."
 
@@ -4755,7 +4765,7 @@ msgstr "Faut-il vraiment supprimer cette identité ? (o/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Faut-il vraiment déplacer la clef principale ? (o/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr "Vous devez sélectionner exactement une clef.\n"
 
@@ -4834,169 +4844,169 @@ msgstr "Faut-il enregistrer les modifications ? (o/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Faut-il quitter sans enregistrer ? (o/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "La clef n'a pas été modifiée donc la mise à jour est inutile.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "Vous ne pouvez pas supprimer la dernière identité.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "revoking the user ID failed: %s\n"
 msgstr "échec de vérification de la liste de confiance : %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "setting the primary user ID failed: %s\n"
 msgstr "échec de vérification de la liste de confiance : %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "« %s » n’est pas une empreinte\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "« %s » n’est pas l’empreinte principale\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "valeur incorrecte\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "No matching user IDs."
 msgstr "Pas d’identités correspondantes."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "Nothing to sign.\n"
 msgstr "Rien à signer.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Non signée par vous.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "échec de vérification de la signature créée : %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 #| msgid "'%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid expiration time\n"
 msgstr "« %s » n'est pas une date d'expiration de signature valable\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "« %s » n’est pas une empreinte\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "clef « %s » introuvable : %s\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Hachage : "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Fonctionnalités : "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr "Serveur de clefs sans modification"
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr "Serveur de clefs favori : "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 msgid "Notations: "
 msgstr "Notations : "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Il n'y a pas de préférences dans une identité de type PGP 2.x.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "La clef suivante a été révoquée le %s par la clef %s %s\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Cette clef peut être révoquée par la clef %s %s"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "créé : %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr "révoquée : %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr "expirée : %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "expire : %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr "utilisation : %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr "nº de carte : "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr "confiance : %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr "validité : %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Cette clef a été désactivée"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5004,17 +5014,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr "révoquée"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "expirée"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5024,17 +5034,17 @@ msgstr ""
 "commande\n"
 "            risque de rendre une autre identité principale par défaut.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "Attention : votre sous-clef de chiffrement expire bientôt.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Vous pourriez modifier aussi sa date d’expiration.\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5043,36 +5053,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Voulez-vous vraiment toujours l'ajouter ? (o/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Vous ne devriez pas ajouter de photo d'identité à une clef de type PGP 2.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "Cette identité existe déjà pour cette clef.\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature incorrecte ? (o/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette autosignature ? (o/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5080,20 +5092,20 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d signature supprimée.\n"
 msgstr[1] "%d signature supprimée.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a été supprimé.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "incorrecte"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Identité « %s » compactée : %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
@@ -5101,17 +5113,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:4467
+#: g10/keyedit.c:4523
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Identité « %s » : déjà minimisée\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Identité « %s » : déjà nettoyée\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5120,46 +5132,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:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de révocateur désigné à une clef de type PGP 2."
 "x.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez l'identité du révocateur désigné : "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossible d'utiliser une clef de type PGP 2.x comme révocateur désigné.\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "vous ne pouvez pas utiliser une clef comme son propre révocateur désigné\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "cette clef à déjà été désignée comme un révocateur\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "Attention : l'établissement d'une clef comme révocateur désigné\n"
 "            est irréversible.\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5169,181 +5181,181 @@ msgid ""
 msgstr ""
 "Voulez-vous vraiment rendre cette clef comme révocateur désigné ? (o/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modification de la date d'expiration d'une sous-clef.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modification de la date d'expiration de la clef principale.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vous ne pouvez pas modifier la date d'expiration d'une clef v3\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "Modification de la date d'expiration d'une sous-clef.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Modification de la date d'expiration de la clef principale.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "la sous-clef de signature %s a déjà une certification croisée\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "la sous-clef %s ne signe pas et n'a donc pas besoin de certification "
 "croisée\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Veuillez sélectionner exactement une identité.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "l'autosignature v3 de l'identité « %s » a été ignorée\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de clefs favori : "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voulez-vous vraiment le remplacer ? (o/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voulez-vous vraiment le supprimer ? (o/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 msgid "Enter the notation: "
 msgstr "Entrez la notation : "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 msgid "Proceed? (y/N) "
 msgstr "Faut-il continuer ? (o/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'identité d'indice %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Pas d'identité avec le hachage %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, fuzzy, c-format
 #| msgid "No subkey with index %d\n"
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Pas de sous-clef d'indice %d\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas de sous-clef d'indice %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "identité : « %s »\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "signée par votre clef %s le %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expiré le %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Voulez-vous vraiment toujours la révoquer ? (o/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 "Faut-il créer un certificat de révocation pour cette signature ? (o/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vous avez signé ces identités sur la clef %s :\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr " (non révocable)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "révoquée par votre clef %s le %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous êtes sur le point de révoquer ces signatures :\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Faut-il vraiment créer les certificats de révocation ? (o/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "pas de clef secrète\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'identité « %s »\" est déjà révoquée.\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "Attention : une signature d'identité date de %d secondes dans le futur\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Vous ne pouvez pas supprimer la dernière identité.\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clef %s est déjà révoqué.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sous-clef %s est déjà révoquée.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5780,6 +5792,10 @@ msgstr ""
 "Ne mettez pas d'adresse électronique dans le nom réel ou dans le "
 "commentaire\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Cette identité existe déjà pour cette clef.\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -6112,7 +6128,7 @@ msgstr "protocole de serveur de clefs incorrect (nous %d!=gestionnaire %d)\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "« %s » n'est pas un identifiant de clef : ignoré\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -6120,50 +6136,50 @@ msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "rafraîchissement de %d clefs à partir de %s\n"
 msgstr[1] "rafraîchissement de %d clefs à partir de %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "Attention : impossible de rafraîchir la clef %s\n"
 "            avec %s : %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "clef « %s » introuvable sur le serveur de clefs\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "clef introuvable sur le serveur de clefs\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requête de la clef %s sur %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 #| msgid "no keyserver action!\n"
 msgid "no keyserver known\n"
 msgstr "pas d'action pour le serveur de clefs.\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "« %s » a été ignorée : %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "envoi de la clef %s à %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "requête de la clef sur « %s »\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Attention : impossible de récupérer l'URI %s : %s\n"
@@ -6196,243 +6212,243 @@ msgstr "chiffré avec l'algorithme inconnu %d\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "phrase secrète générée avec l'algorithme de hachage %d inconnu\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr "la clef publique est %s\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr ""
 "chiffré avec une clef %2$s de %1$u bits, identifiant %3$s, créée le %4$s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      « %s »\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "chiffré avec une clef %s, identifiant %s\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "Attention : plusieurs textes en clair ont été vus\n"
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "chiffré avec %lu phrases secrètes\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "chiffré avec 1 phrase secrète\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "échec du déchiffrement par clef publique : %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 "données chiffrées par clef publique : bonne clef de chiffrement (DEK)\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "les données sont supposées chiffrées avec %s\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "L'algorithme IDEA n'est pas disponible, essai avec %s\n"
 "qui fonctionnera peut-être avec un peu de chance\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "Attention : l'intégrité du message n'était pas protégée\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "échec du déchiffrement : %s\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "le déchiffrement a réussi\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Attention : le message chiffré a été manipulé.\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "échec du déchiffrement : %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Remarque : l'expéditeur a demandé « à votre seule attention »\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original : « %.*s »\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "révocation autonome — utilisez « gpg --import » pour l'appliquer\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, c-format
 msgid "no signature found\n"
 msgstr "aucune signature trouvée\n"
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MAUVAISE signature de « %s »"
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature expirée de « %s »"
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bonne signature de « %s »"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "vérification de signature supprimée\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "impossible de traiter ces données ambiguës de signature\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature faite le %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               avec la clef %s %s\n"
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature faite le %s avec la clef %s d'identifiant %s\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "                alias « %s »"
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Clef disponible sur : "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[doute]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias « %s »"
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 "Attention : cette clef n'est pas certifiée avec une signature de confiance.\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "La signature a expiré le %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "signature %s, algorithme de hachage %s%s%s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "binaire"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "mode texte"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "inconnu"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 msgid ", key algorithm "
 msgstr ", algorithme de clef "
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de vérifier la signature : %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas détachée\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
@@ -6440,12 +6456,12 @@ msgstr ""
 "Attention : plusieurs signatures ont été détectées.\n"
 "            Seule la première sera vérifiée.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien type (PGP 2.x)\n"
@@ -6522,11 +6538,6 @@ msgstr ""
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s : %d : option « %s » déconseillée\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "Attention : « %s » est une option déconseillée\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7689,134 +7700,134 @@ msgstr "erreur de lecture dans « %s » : %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de confiance : échec de synchronisation : %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "impossible de créer un verrou pour « %s »\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "impossible de verrouiller « %s »\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "enregistrement de base de confiance %lu : échec de lseek : %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "enregistrement de base de confiance %lu : échec d'écriture (n=%d) : %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "transaction de base de confiance trop grande\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s : le répertoire n'existe pas.\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "impossible d'accéder à « %s » : %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s : impossible de créer un enregistrement de version : %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s : base de confiance incorrecte créée\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s : base de confiance créée\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Remarque : la base de confiance n'est pas accessible en écriture\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s : base de confiance incorrecte\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s : échec de création de la table de hachage : %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s : erreur de mise à jour de l'enregistrement de version : %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s : erreur de lecture d'enregistrement de version : %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s : erreur d'écriture de l'enregistrement de version : %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de confiance : échec de lseek : %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de confiance : échec de lecture (n=%d) : %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s : ce n'est pas un fichier de base de confiance\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s : enregistrement de version avec le numéro %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s : version %d du fichier incorrecte\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s : erreur de lecture d'enregistrement libre : %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s : erreur d'écriture de l'enregistrement de répertoire: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s : échec de mise à zéro d'un enregistrement : %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s : impossible d'ajouter un enregistrement : %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Erreur : la base de confiance est corrompue\n"
@@ -8461,16 +8472,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8513,10 +8524,10 @@ msgstr ""
 "|P|Veuillez entrer le code de déblocage personnel (CDP) pour les clefs "
 "standards."
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "le rappel du code personnel a renvoyé une erreur : %s\n"
@@ -8542,58 +8553,58 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr "la clef existe déjà\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "la clef existante sera remplacée\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr "génération d'une nouvelle clef\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, c-format
 msgid "writing new key\n"
 msgstr "écriture d'une nouvelle clef\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "impossible de stocker la clef : %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "la réponse ne contient pas le module RSA\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la réponse ne contient pas l'exposant public RSA\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, fuzzy, c-format
 #| msgid "response does not contain the EC public point\n"
 msgid "response does not contain the EC public key\n"
 msgstr "la réponse ne contient pas le point public EC\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "veuillez patienter pendant la génération de la clef…\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr "échec de génération de la clef\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8601,12 +8612,12 @@ msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "la génération de clef est terminé (%d secondes)\n"
 msgstr[1] "la génération de clef est terminé (%d secondes)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "la réponse ne contient pas les données de clef publique\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 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 "
@@ -8614,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:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Veuillez entrer le code personnel d'administration"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|P|Veuillez entrer le code de déblocage personnel (CDP) pour les clefs "
 "standards."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Veuillez entrer le code personnel pour les clefs standards."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "le module RSA est manquant ou sa taille n'est pas de %d bits\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "l'exposant public RSA est manquant ou plus grand que %d bits\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "le code personnel nul n'a pas encore été modifié\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "le code personnel nul n'a pas encore été modifié\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Veuillez entrer un nouveau code personnel pour les clefs standards."
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|NP|Veuillez entrer un nouveau code de déblocage personnel (CDP) pour les "
 "clefs standards."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 "|N|Veuillez entrer un nouveau code personnel pour permettre à la clef de "
 "créer des signatures qualifiées."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8673,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:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8681,27 +8692,27 @@ 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:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erreur de lecture du nouveau code personnel : %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "impossible de stocker l'empreinte : %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "impossible de stocker la date de création : %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "erreur de récupération de l'état CHV de la carte\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "échec de lecture de clef publique : %s\n"
@@ -8709,48 +8720,48 @@ msgstr "échec de lecture de clef publique : %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "utilisation du code personnel par défaut en tant que %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "impossible d'utiliser le code personnel par défaut en tant que %s :\n"
 "%s — désactivation de la prochaine utilisation par défaut\n"
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||Veuillez entrer le code personnel"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 "le code personnel pour CHV%d est trop court ; la taille minimale\n"
 "est %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "échec de vérification CHV%d : %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "la carte est irrémédiablement bloquée.\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, fuzzy, c-format
 #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@ -8763,20 +8774,20 @@ msgstr[1] ""
 "il reste %d tentatives de code personnel d'administration\n"
 "avant que la carte ne soit irrémédiablement bloquée\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "l'accès aux commandes d'administration n'est pas configuré\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 msgid "||Please enter the PIN"
 msgstr "||Veuillez entrer le code personnel"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Veuillez entrer le code de réinitialisation pour la carte"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8786,77 +8797,77 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nouveau code de réinitialisation"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nouveau code personnel d'administration"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr "|N|Nouveau code personnel"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr ""
 "||Veuillez entrer le code personnel d'administration et le nouveau code "
 "personnel d'administration"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Veuillez entrer le code personnel et le nouveau code personnel"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr "erreur de lecture des données d'application\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "erreur de lecture de l'empreinte DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "la date de création est manquant\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 "le nombre premier RSA %s est manquant ou sa taille n'est pas de\n"
 "%d bits\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI non pris en charge"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structure de carte OpenPGP incorrecte (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "l'empreinte de la carte ne correspond pas à celle demandée\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "la carte ne gère pas l'algorithme de hachage %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures créées jusqu'à présent : %lu\n"
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8864,7 +8875,7 @@ msgstr ""
 "la vérification du code personnel d'administration est actuellement\n"
 "interdite avec cette commande\n"
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -8886,7 +8897,7 @@ msgstr "|N|Nouveau code personnel initial"
 msgid "run in multi server mode (foreground)"
 msgstr "exécuter en mode multiserveur (premier plan)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVEAU|définir le niveau de débogage à NIVEAU"
 
@@ -8930,11 +8941,11 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "refus d'utiliser les commandes d'administration de la carte"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Utilisation : @SCDAEMON@ [options] (-h pour l'aide)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8942,24 +8953,24 @@ msgstr ""
 "Syntaxe : scdaemon [options] [commande [arguments]]\n"
 "Démon de carte à puce pour @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "veuillez utiliser l'option « --daemon » pour exécuter le programme\n"
 "en arrière-plan\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "gestionnaire pour le descripteur %d démarré\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "gestionnaire pour le descripteur %d terminé\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -9189,7 +9200,7 @@ msgstr "le certificat racine n'est pas marqué de confiance"
 msgid "checking the trust list failed: %s\n"
 msgstr "échec de vérification de la liste de confiance : %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "chaîne de certificats trop longue\n"
@@ -9249,7 +9260,7 @@ msgstr ""
 "un hachage de %1$u bits n'est pas valable pour une clef %3$s de %2$u bits\n"
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
@@ -9296,46 +9307,46 @@ msgstr ""
 "numéro de série %s, identifiant 0x%08lX,\n"
 "créé le %s, expire le %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 "aucune utilisation de clef indiquée — toutes les utilisations sont "
 "supposées\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "le certificat n'aurait pas dû être utilisé pour la certification\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 "le certificat n'aurait pas dû être utilisé pour la signature de réponse "
 "OCSP\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "le certificat n'aurait pas dû être utilisé pour le chiffrement\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "le certificat n'aurait pas dû être utilisé pour la signature\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "le certificat n'est pas utilisable pour le chiffrement\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "le certificat n'est pas utilisable pour la signature\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9525,6 +9536,11 @@ msgstr "Faut-il créer un certificat autosigné ? (o/N) "
 msgid "These parameters are used:\n"
 msgstr "Ces paramètres seront utilisés :\n"
 
+#: sm/certreqgen-ui.c:433
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "erreur de création du fichier temporaire : %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr "Création de certificat autosigné. "
@@ -9598,123 +9614,123 @@ msgstr "échec de suppression du certificat « %s » : %s\n"
 msgid "no valid recipients given\n"
 msgstr "aucune destinataire valable donnée\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "list external keys"
 msgstr "afficher les clefs externes"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "list certificate chain"
 msgstr "afficher la chaîne de certificats"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 msgid "import certificates"
 msgstr "importer les certificats"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "export certificates"
 msgstr "exporter les certificats"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr "enregistrer une carte à puce"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr "passer une commande au dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr "appeler gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr "|N|nombre de certificats à inclure"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr "|FICHIER|prendre renseignements de politique du FICHIER"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr "entrée supposée au format PEM"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr "entrée supposée au format base-64"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr "entrée supposée au format binaire"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 msgid "create base-64 encoded output"
 msgstr "créer une sortie encodée en base-64"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|IDENTITÉ| utiliser IDENTITÉ comme clef secr. par défaut"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FICHIER|ajouter le trousseau à la liste de trousseaux"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr "récupérer certificats d'émetteur manquants"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOM|utiliser l’encodage NOM pour les phrases secrète PKCS#12"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr "ne pas consulter liste de révocations de cert."
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr "ne pas vérifier les listes de révocations de certificat racine"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr "vérifier la validité avec OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr "ne pas vérifier les politiques de certificat"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de hachage NOM"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "mode automatique : aucune question"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "oui comme réponse à la plupart des questions"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "non comme réponse à la plupart des questions"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FICHIER|écrire un journal d'audit dans le FICHIER"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Utilisation : @GPGSM@ [options] [fichiers] (-h pour l'aide)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9724,27 +9740,27 @@ msgstr ""
 "Signer, vérifier, chiffrer ou déchiffrer en utilisant le protocole S/MIME\n"
 "L'opération par défaut dépend des données entrées\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Remarque : ne sera pas capable de chiffrer à « %s » : %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "modèle de validation « %s » inconnu\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importation des certificats commun « %s »\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "impossible de signer en utilisant « %s » : %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "commande incorrecte (il n'y a pas de commande implicite)\n"
@@ -9774,7 +9790,7 @@ msgstr "erreur de lecture des options stockées : %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "erreur d'importation du certificat : %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "erreur de lecture de l'entrée : %s\n"
@@ -9817,7 +9833,7 @@ msgstr "problème de nouvelle recherche de certificat : %s\n"
 msgid "error storing flags: %s\n"
 msgstr "erreur de stockage des options : %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Erreur — "
 
@@ -10203,11 +10219,6 @@ msgstr "impossible de créer le répertoire de cache temporaire « %s » : %s
 msgid "error closing '%s': %s\n"
 msgstr "erreur de fermeture de « %s » : %s\n"
 
-#: dirmngr/crlcache.c:948
-#, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "erreur en renommant « %s » en « %s » : %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
@@ -10938,94 +10949,94 @@ msgstr "les niveaux de débogage possibles sont : %s\n"
 msgid "usage: %s [options] "
 msgstr "utilisation : %s [options] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "les deux-points ne sont pas permis dans le nom de socket\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, 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:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr ""
 "échec du traitement de liste de révocations de certificat sur « %s » : %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s : %u : ligne trop longue — ignorée\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s : %u : empreinte incorrecte détectée\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s : %u : erreur de lecture : %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s : %u : fin de ligne inutile ignorée\n"
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "SIGHUP reçu — relecture de la configuration et vidage des caches\n"
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 reçu — aucune action définie\n"
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM reçu — arrêt…\n"
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM reçu — encore %d connexions actives\n"
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, c-format
 msgid "shutdown forced\n"
 msgstr "arrêt forcé\n"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT reçu — arrêt immédiat\n"
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d reçu — aucune action définie\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "erreur d'accès à « %s » : état HTTP %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL « %s » redirigée vers « %s » (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "trop de redirections\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11397,57 +11408,57 @@ msgstr ""
 "le certificat n'aurait pas dû être utilisé pour signer une liste de "
 "révocations de certificat\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "silencieux"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr "afficher les données encodées au format hexadécimal"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr "décoder les lignes de données reçues"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr "se connecter au dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 #, fuzzy
 #| msgid "connect to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "se connecter au dirmngr"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NOM|se connecter à la socket Assuan NOM"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADR|se connecter au serveur Assuan à ADR"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr "exécuter le serveur Assuan donné en ligne de commande"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr "ne pas utiliser le mode de connexion étendu"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FICHIER|exécuter les commandes du FICHIER au démarrage"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr "exécuter /subst au démarrage"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Utilisation : @GPG@-connect-agent [options] (-h pour l'aide)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -11455,50 +11466,50 @@ msgstr ""
 "Syntaxe : @GPG@-connect-agent [options]\n"
 "Se connecter à un agent en fonctionnement et envoyer des commandes\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "l'option « %s » nécessite un programme et des arguments facultatifs\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "option « %s » ignorée à cause de « %s »\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "échec de réception de ligne : %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "ligne trop longue — ignorée\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "ligne raccourcie à cause de caractère NULL inclus\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "commande « %s » inconnue\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "échec d'envoi de ligne : %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr ""
 "aucune instance de gpg-agent n'est en cours d'exécution dans cette session\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erreur d'envoi d'options standards : %s\n"
@@ -11572,13 +11583,13 @@ msgstr "Échec de vérification externe du composant %s"
 msgid "Note that group specifications are ignored\n"
 msgstr "Remarquez que les spécifications de groupe sont ignorées\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 #| msgid "error closing '%s': %s\n"
 msgid "error closing '%s'\n"
 msgstr "erreur de fermeture de « %s » : %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 #| msgid "error hashing '%s': %s\n"
 msgid "error parsing '%s'\n"
@@ -11775,6 +11786,14 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "erreur d'écriture du fichier temporaire : %s\n"
+
+#, fuzzy
+#~| msgid "run in server mode"
+#~ msgid "run in supervised mode"
+#~ msgstr "exécuter en mode serveur"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
@@ -12128,9 +12147,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "impossible d'ouvrir %s en écriture : %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "erreur d'écriture sur %s : %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "erreur de fermeture de %s : %s\n"
 
diff --git a/po/gl.po b/po/gl.po
index e0934b2..07bd9cd 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
@@ -26,53 +26,53 @@ msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, fuzzy
 #| msgid "Do you really want to create a sign and encrypt key? "
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "¿Seguro que quere crear unha chave para asinar e cifrar? "
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "contrasinal incorrecto"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -83,28 +83,28 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "contrasinal demasiado longo\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -114,107 +114,107 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "contrasinal erróneo"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "PIN too long"
 msgstr "liña longa de máis\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "contrasinal demasiado longo\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter non válido no nome\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI erróneo"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "contrasinal erróneo"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: agent/command.c:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -226,9 +226,9 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "o algoritmo de protección %d%s non está soportado\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
@@ -236,15 +236,15 @@ msgstr "non se pode crear `%s': %s\n"
 
 #: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -255,138 +255,129 @@ 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:2513
+#: agent/command-ssh.c:2467
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Por favor, introduza o contrasinal; esta é unha frase secreta \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: fallo ao crear unha táboa hash: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 #, fuzzy
 msgid "Admin PIN"
 msgstr "Introduza o ID de usuario: "
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Repita o contrasinal: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Repita o contrasinal: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repita o contrasinal: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; ténteo de novo"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "erro ao crea-lo contrasinal: %s\n"
-
-#: agent/genkey.c:150
+#: agent/genkey.c:154
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "escribindo a `%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduza o contrasinal\n"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -394,7 +385,7 @@ msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "O nome debe ter alomenos 5 caracteres\n"
 msgstr[1] "O nome debe ter alomenos 5 caracteres\n"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -402,243 +393,237 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "¿Empregar esta chave de tódolos xeitos?"
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Necesita un contrasinal para protexe-la súa chave secreta.\n"
 "\n"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 #, fuzzy
 msgid "Options used for startup"
 msgstr "habilitar depuración total"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "A chave é obsoleta"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "lareto"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "ser un pouquiño máis calado"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza-la base de datos de confianza"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|axusta-lo xogo de caracteres do terminal a NOME"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "non está soportado"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "non está soportado"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|emprega-lo modo de contrasinal N"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "emprega-lo gpg-agent"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -646,145 +631,150 @@ 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:571
+#: agent/gpg-agent.c:570
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non é válido\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "lendo as opcións de `%s'\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, fuzzy, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "Revocación de certificado válida"
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, fuzzy, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: agent/gpg-agent.c:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, 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:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, 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:2385
+#: agent/gpg-agent.c:2395
 #, 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:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2832
+#: agent/gpg-agent.c:2842
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "o segredo da actualización fallou: %s\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves omitidas\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non está dispoñible nesta sesión\n"
@@ -810,7 +800,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -820,7 +810,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -874,42 +864,42 @@ msgstr "Cancelar"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "erro de lectura: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "hai partes da chave secreta non dispoñibles\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "erro de lectura: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -922,19 +912,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "si|sim"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -947,7 +937,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -957,48 +947,63 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "erro lendo `%s': %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 #, fuzzy
 msgid "Change passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1231
+#, c-format
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1741
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "¿Seguro de que quere borra-las chaves seleccionadas? "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 #, fuzzy
 msgid "Delete key"
 msgstr "habilitar unha chave"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1020,7 +1025,7 @@ msgstr ""
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
@@ -1062,7 +1067,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -1124,12 +1129,12 @@ 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:905
+#: common/sysutils.c:880
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "a actualización fallou: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
@@ -1359,7 +1364,7 @@ msgid "algorithm: %s"
 msgstr "armadura: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1532,7 +1537,7 @@ msgstr "non se puido poñe-la armadura: %s\n"
 msgid "iconv_open failed: %s\n"
 msgstr "non se puido abrir un ficheiro: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
@@ -1571,7 +1576,7 @@ msgstr "non se atopou a chave pública %08lX: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1746,7 +1751,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent non está dispoñible nesta sesión\n"
@@ -1789,7 +1794,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "xerar un certificado de revocación"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1817,7 +1822,7 @@ msgstr "non se pode facer iso no modo por lotes\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "hai partes da chave secreta non dispoñibles\n"
@@ -1884,15 +1889,15 @@ msgstr "non hai unha chave pública correspondente: %s\n"
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
@@ -2240,27 +2245,27 @@ msgstr "gravando a chave secreta en `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2324,8 +2329,8 @@ msgid "subkey"
 msgstr "Pública: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualización fallou: %s\n"
@@ -2387,14 +2392,14 @@ msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2417,7 +2422,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2529,12 +2534,12 @@ msgstr "gravando a chave secreta en `%s'\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: chave estilo PGP 2.x - omitida\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, fuzzy, c-format
 #| msgid "error creating `%s': %s\n"
@@ -2604,297 +2609,297 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 #, fuzzy
 msgid "make a signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar só con cifrado simétrico"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocación"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro público"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "actualizar tódalas chaves dun servidor de chaves"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "non facer ningún cambio"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "crear saída con armadura en ascii"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 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:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "usar modo de texto canónico"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresión a N (0 desactiva)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2902,7 +2907,7 @@ msgstr ""
 "@\n"
 "(Vexa a páxina man para un listado completo de comandos e opcións)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2932,13 +2937,13 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2953,7 +2958,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operación por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2961,571 +2966,571 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Pública: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Compresión: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uso: gpg [opcións] "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "non se atopou un signo = na definición do grupo \"%s\"\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr " creouse un novo ficheiro de configuración `%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro está unha chave listada"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "NOTA: ¡%s non é para uso normal!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Non é un enderezo de e-mail válido\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 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:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 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:3314
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcións de importación non válidas\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcións de importación non válidas\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opcións de exportación non válidas\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opcións de importación non válidas\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: ¡o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "¡%s non se admite con %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "¡%s non ten sentido empregándoo con %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non é válido\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non é válido\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non é válido\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificación seleccionado non é válido\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, fuzzy, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobación por defecto non válido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, fuzzy, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nivel de comprobación por defecto non válido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desaconséllase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non válido; debe ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non válidas\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non válidas\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "preferencias de cifrado personais non válidas\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non válidas\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresión personais non válidas\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "tamaño de chave non válido; empregando %u bits\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "¡%s aínda non traballa con %s!\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "non se pode empregar o algoritmo de compresión \"%s\" no modo %s\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave pública\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o envío ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepción do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportación da chave fallou: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "a exportación da chave fallou: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualización no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo de hash non válido `%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a súa mensaxe ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificación dado non é válido\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non é válido\n"
@@ -3539,7 +3544,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la información de estado a este DF"
 
@@ -4273,7 +4278,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "¿Está seguro de que quere asinalo? (s/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
@@ -4472,8 +4477,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "¿Asinar de verdade? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
@@ -4693,7 +4698,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "A chave está revocada."
 
@@ -4746,7 +4751,7 @@ msgstr "¿Seguro de que quere borrar este ID de usuario? "
 msgid "Really move the primary key? (y/N) "
 msgstr "¿Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
@@ -4835,169 +4840,169 @@ msgstr "¿Garda-los cambios? "
 msgid "Quit without saving? (y/N) "
 msgstr "¿Saír sin gardar? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "¡Non pode borra-lo último ID de usuario!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "valor non válido\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Non hai tal ID de usuario.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Nada que asinar coa chave %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   asinada por %08lX no %s%s\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s non é un xogo de caracteres válido\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Características: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 #, fuzzy
 msgid "Notations: "
 msgstr "Notación: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Esta chave está desactivada"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5005,19 +5010,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5026,18 +5031,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:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Non pode cambia-la data de expiración dunha chave v3\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5046,37 +5051,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "¿Está seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non pode engadir unha identificación fotográfica a unha chave de estilo "
 "PGP2.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "¿Borrar esta sinatura descoñecida? (s/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "¿Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5084,38 +5089,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Borrada %d sinatura.\n"
 msgstr[1] "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non válida"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "O ID de usuario \"%s\" está revocado."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5125,45 +5130,45 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versións de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: ¡Esta chave está revocada polo propietario!\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVISO: ¡o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "¿Está seguro de que quere nomear esta chave coma revocador designado? (s/N): "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5171,184 +5176,184 @@ msgid ""
 msgstr ""
 "¿Está seguro de que quere nomear esta chave coma revocador designado? (s/N): "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiración para a chave secundaria.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiración da chave primaria.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non pode cambia-la data de expiración dunha chave v3\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Cambiando a data de expiración para a chave secundaria.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Cambiando a data de expiración da chave primaria.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVISO: ¡o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "¿Está seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "¿Está seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notación de sinaturas: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "¿Sobrescribir? (s/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con índice %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   asinada por %08lX no %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "¿Está seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "¿Crear un certificado de revocación para esta sinatura? (s/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "¿Realmente desexa crea-los certificados de revocación? (s/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: unha sinatura de ID de usuario ten unha data %d segundos no futuro\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "¡Non pode borra-lo último ID de usuario!\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa está revocado\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5779,6 +5784,10 @@ msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Por favor, non poña o enderezo de correo no nome real ou no comentario\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -6113,56 +6122,56 @@ msgstr "opcións de exportación non válidas\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: non é un ID de chave válido\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "solicitando a chave %08lX de %s\n"
 msgstr[1] "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "opcións de exportación non válidas\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "omítese `%s': %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "asinado coa súa chave %08lX no %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
@@ -6195,252 +6204,252 @@ msgstr "cifrado cun algoritmo descoñecido %d\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado cun algoritmo descoñecido %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "cifrado cunha chave de %u bits, %s, ID %08lX, creado o %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu contrasinais\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 contrasinal\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave pública: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave pública: DEK correcto\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supoñendo datos cifrados con %s\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "A cifra IDEA non está dispoñible, téntase empregar %s no seu canto\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensaxe non tiña protección de integridade\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: ¡a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remitente pediu \"confidencial\"\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocación independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verificación de sinatura suprimida\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "non se poden manexar estas sinaturas múltiples\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Sinatura feita o %.*s usando %s coa chave de ID %08lX\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Chave dispoñible en: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               alias \""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "AVISO: ¡Esta chave non está certificada cunha sinatura de confianza!\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "descoñecido"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritmo de chave pública descoñecido"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "non é unha sinatura separada\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVISO: detectáronse sinaturas múltiples. Só se ha comproba-la primeira.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura ó vello estilo (PGP 2.x)\n"
@@ -6516,11 +6525,6 @@ msgstr ""
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opción a extinguir \"%s\"\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "AVISO: \"%s\" é unha opción a extinguir\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7618,135 +7622,135 @@ msgstr "erro de lectura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de datos de confianza: fallou a sincronización: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "rexistro da base de datos de confianza %lu: lseek fallou: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 "rexistro da base de datos de confianza %lu: fallou a escritura (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "transacción da base de datos de confianza demasiado grande\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ¡o directorio non existe!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: non se puido crea-lo rexistro de versión: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: creouse unha base de datos de confianza incorrecta\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: creouse a base de datos de confianza\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "NOTA: non se pode escribir na base de datos de confianza\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza non válida\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo ao crear unha táboa hash: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro ao actualiza-lo rexistro de versión: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao le-lo rexistro de versión: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de versión: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: lseek fallou: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non é un ficheiro de base de datos de confianza\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: rexistro de versión con número de rexistro %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versión do ficheiro incorrecta %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escribi-lo rexistro de directorios: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: non se puido pór a cero un rexistro: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: non se puido engadir un rexistro: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: creouse a base de datos de confianza\n"
@@ -8370,16 +8374,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8414,10 +8418,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8437,158 +8441,158 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' xa está comprimido\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "borrar chaves do chaveiro público"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "A xeración da chave fallou: %s\n"
 msgstr[1] "A xeración da chave fallou: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Por favor, escolla o motivo da revocación:\n"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Nota: Esta chave está desactivada.\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Por favor, escolla o motivo da revocación:\n"
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "fallo ao reconstruí-la caché de chaveiros: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
@@ -8596,43 +8600,43 @@ msgstr "fallou o borrado do bloque de chaves: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "o envío ao servidor de chaves fallou: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8640,22 +8644,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Por favor, escolla o motivo da revocación:\n"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8663,81 +8667,81 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI non soportado"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP válidos.\n"
@@ -8759,7 +8763,7 @@ msgstr "Introduza o ID de usuario: "
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8808,33 +8812,33 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "comandos conflictivos\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
@@ -9073,7 +9077,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "fallou a comprobación da sinatura creada: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, fuzzy, c-format
 msgid "certificate chain too long\n"
 msgstr "Revocación de certificado válida"
@@ -9130,7 +9134,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -9177,42 +9181,42 @@ msgstr ""
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 #| msgid "bad certificate"
 msgid "looking for another certificate\n"
@@ -9408,6 +9412,11 @@ msgstr "¿Crear un certificado de revocación para esta sinatura? "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:433
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "erro ao crea-lo contrasinal: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9480,134 +9489,134 @@ msgstr "fallou o borrado do bloque de chaves: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Non se deu unha descrición)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "list external keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Revocación de certificado válida"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "non usa-la terminal en absoluto"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crear saída con armadura en ascii"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "engadir este chaveiro á lista de chaveiros"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME para os contrasinais"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "modo por lotes: non preguntar nunca"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "asumir `si' na maioría das preguntas"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "asumir `non' na maioría das preguntas"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9618,27 +9627,27 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operación por defecto depende dos datos de entrada\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9668,7 +9677,7 @@ msgstr "erro ao crea-lo contrasinal: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -9708,7 +9717,7 @@ msgstr "rev? problema ao comproba-la revocación: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -10075,12 +10084,6 @@ msgstr "non se pode crea-lo directorio `%s': %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/crlcache.c:948
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "erro lendo `%s': %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
@@ -10774,93 +10777,93 @@ msgstr ""
 msgid "usage: %s [options] "
 msgstr "uso: gpg [opcións] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "¡%s non se admite con %s!\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "non se puido poñe-la armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "liña longa de máis\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "erro: pegada dactilar non válida\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "erro de lectura: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "non procesado"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "demasiadas preferencias `%c'\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11231,105 +11234,105 @@ msgstr "Revocación de certificado válida"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "abandonar"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FICHEIRO|carga-lo módulo de extensión FICHEIRO"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg [opcións] [ficheiros] (-h para ve-la axuda)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "liña longa de máis\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "destinatario por defecto `%s' descoñecido\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "gpg-agent non está dispoñible nesta sesión\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
@@ -11395,12 +11398,12 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "erro lendo `%s': %s\n"
@@ -11590,6 +11593,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "escribindo a `%s'\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "A chave é obsoleta"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "O nome non pode comezar cun díxito\n"
 
@@ -11853,10 +11865,6 @@ msgstr ""
 #~ msgstr "non se puido abrir %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "erro escribindo no chaveiro `%s': %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "erro lendo `%s': %s\n"
 
diff --git a/po/gnupg2.pot b/po/gnupg2.pot
index 296ecaa..c7729ba 100644
--- a/po/gnupg2.pot
+++ b/po/gnupg2.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: GNU gnupg 2.3.5\n"
+"Project-Id-Version: GNU gnupg 2.3.7\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr ""
@@ -29,49 +29,49 @@ msgstr ""
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr ""
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr ""
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -82,27 +82,27 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 msgid "Passphrase Not Allowed"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -112,99 +112,99 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr ""
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 msgid "PIN too long"
 msgstr ""
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 msgid "Passphrase too long"
 msgstr ""
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 msgid "Invalid characters in PIN"
 msgstr ""
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad PIN"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad Passphrase"
 msgstr ""
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr ""
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr ""
 
-#: agent/command.c:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -216,24 +216,24 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr ""
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr ""
 
 #: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr ""
@@ -243,137 +243,128 @@ msgstr ""
 msgid "no suitable card key found: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2513
+#: agent/command-ssh.c:2467
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr ""
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr ""
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr ""
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr ""
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr ""
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr ""
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr ""
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr ""
-
-#: agent/genkey.c:150
+#: agent/genkey.c:154
 #, c-format
-msgid "error writing to temporary file: %s\n"
+msgid "error writing to pipe: %s\n"
 msgstr ""
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 msgid "Enter new passphrase"
 msgstr ""
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -381,361 +372,362 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 msgid "Take this one anyway"
 msgstr ""
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 msgid "Please enter the new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-msgid "run in supervised mode"
-msgstr ""
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 msgid "|FILE|read options from FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr ""
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr ""
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr ""
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr ""
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr ""
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 msgid "disallow the use of an external password cache"
 msgstr ""
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 msgid "allow presetting passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 msgid "|N|expire the passphrase after N days"
 msgstr ""
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 msgid "do not allow the reuse of old passphrases"
 msgstr ""
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr ""
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr ""
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2832
+#: agent/gpg-agent.c:2842
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr ""
@@ -756,7 +748,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -764,7 +756,7 @@ msgid ""
 msgstr ""
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -811,42 +803,42 @@ msgstr ""
 msgid "error while asking for the passphrase: %s\n"
 msgstr ""
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr ""
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr ""
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr ""
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr ""
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -859,18 +851,18 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 msgid "Yes"
 msgstr ""
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -883,7 +875,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -893,46 +885,60 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr ""
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 msgid "Change passphrase"
 msgstr ""
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1231
+#, c-format
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1741
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr ""
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 msgid "Delete key"
 msgstr ""
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -954,7 +960,7 @@ msgstr ""
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr ""
@@ -993,7 +999,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, c-format
 msgid "error forking process: %s\n"
 msgstr ""
@@ -1054,12 +1060,12 @@ msgstr ""
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr ""
 
-#: common/sysutils.c:905
+#: common/sysutils.c:880
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr ""
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr ""
@@ -1273,7 +1279,7 @@ msgid "algorithm: %s"
 msgstr ""
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1428,7 +1434,7 @@ msgstr ""
 msgid "iconv_open failed: %s\n"
 msgstr ""
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr ""
@@ -1467,7 +1473,7 @@ msgstr ""
 msgid "waiting for lock %s...\n"
 msgstr ""
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1631,7 +1637,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr ""
@@ -1669,7 +1675,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr ""
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, c-format
 msgid "Note: %s\n"
 msgstr ""
@@ -1696,7 +1702,7 @@ msgstr ""
 msgid "This command is only available for version 2 cards\n"
 msgstr ""
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr ""
@@ -1761,14 +1767,14 @@ msgstr ""
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
@@ -2089,26 +2095,26 @@ msgstr ""
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr ""
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr ""
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2167,8 +2173,8 @@ msgid "subkey"
 msgstr ""
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
@@ -2228,14 +2234,14 @@ msgstr ""
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 sm/sign.c:597 sm/verify.c:510
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2256,7 +2262,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr ""
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2354,12 +2360,12 @@ msgstr ""
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr ""
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr ""
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, c-format
 msgid "error creating '%s': %s\n"
@@ -2423,274 +2429,274 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr ""
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 msgid "make a signature"
 msgstr ""
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "make a clear text signature"
 msgstr ""
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr ""
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr ""
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr ""
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr ""
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr ""
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr ""
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr ""
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr ""
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr ""
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr ""
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr ""
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 msgid "quickly generate a new key pair"
 msgstr ""
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "quickly add a new user-id"
 msgstr ""
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 msgid "quickly revoke a user-id"
 msgstr ""
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly set a new expiration date"
 msgstr ""
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr ""
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr ""
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "quickly sign a key"
 msgstr ""
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "quickly sign a key locally"
 msgstr ""
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 msgid "quickly revoke a key signature"
 msgstr ""
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr ""
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr ""
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr ""
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr ""
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr ""
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr ""
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr ""
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr ""
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr ""
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr ""
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid "print message digests"
 msgstr ""
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr ""
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr ""
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr ""
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 msgid "import missing key from a signature"
 msgstr ""
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 msgid "include the public key in signatures"
 msgstr ""
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 msgid "Options to specify keys"
 msgstr ""
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr ""
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2702,571 +2708,571 @@ msgid ""
 " --fingerprint [names]      show fingerprints\n"
 msgstr ""
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr ""
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
 "Default operation depends on the input data\n"
 msgstr ""
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
 msgstr ""
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr ""
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr ""
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 msgid "show key usage information during key listings"
 msgstr ""
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr ""
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr ""
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr ""
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr ""
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr ""
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr ""
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr ""
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr ""
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr ""
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr ""
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr ""
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr ""
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr ""
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr ""
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, c-format
 msgid "selected AEAD algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr ""
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, c-format
 msgid "invalid personal AEAD preferences\n"
 msgstr ""
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr ""
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr ""
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr ""
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr ""
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
@@ -3279,7 +3285,7 @@ msgstr ""
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr ""
 
@@ -3974,7 +3980,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr ""
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -4136,8 +4142,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr ""
@@ -4327,7 +4333,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr ""
 
@@ -4375,7 +4381,7 @@ msgstr ""
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr ""
 
@@ -4449,475 +4455,475 @@ msgstr ""
 msgid "Quit without saving? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr ""
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr ""
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "No matching user IDs."
 msgstr ""
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "Nothing to sign.\n"
 msgstr ""
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr ""
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr ""
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr ""
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 msgid "Notations: "
 msgstr ""
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr ""
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr ""
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr ""
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr ""
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr ""
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr ""
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr ""
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr ""
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr ""
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 msgid "Changing usage of a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 msgid "Changing usage of the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 msgid "Proceed? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr ""
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr ""
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5302,6 +5308,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5606,54 +5616,54 @@ msgstr ""
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr ""
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr ""
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr ""
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
@@ -5683,245 +5693,245 @@ msgstr ""
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr ""
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr ""
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr ""
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr ""
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr ""
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr ""
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, c-format
 msgid "no signature found\n"
 msgstr ""
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr ""
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr ""
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr ""
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 msgid ", key algorithm "
 msgstr ""
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
@@ -5991,11 +6001,6 @@ msgstr ""
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr ""
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -6980,133 +6985,133 @@ msgstr ""
 msgid "trustdb: sync failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr ""
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr ""
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr ""
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr ""
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr ""
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr ""
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr ""
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr ""
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr ""
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr ""
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr ""
@@ -7701,16 +7706,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -7739,10 +7744,10 @@ msgstr ""
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr ""
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -7762,150 +7767,150 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr ""
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr ""
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, c-format
 msgid "writing new key\n"
 msgstr ""
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr ""
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr ""
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr ""
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 msgid "|A|Please enter the Admin PIN"
 msgstr ""
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 msgid "||Please enter the PIN for the standard keys."
 msgstr ""
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 msgid "Note: PIN has not yet been enabled."
 msgstr ""
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr ""
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr ""
@@ -7913,42 +7918,42 @@ 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-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 msgid "||Please unlock the card"
 msgstr ""
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -7956,20 +7961,20 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 msgid "||Please enter the PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 msgid "||Please enter the Reset Code for the card"
 msgstr ""
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -7977,78 +7982,78 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 msgid "||Please enter the PIN and New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, c-format
 msgid "unsupported curve\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -8068,7 +8073,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8112,32 +8117,32 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr ""
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr ""
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -8363,7 +8368,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr ""
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
@@ -8418,7 +8423,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
@@ -8459,42 +8464,42 @@ msgid ""
 "created %s, expires %s.\n"
 msgstr ""
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, c-format
 msgid "looking for another certificate\n"
 msgstr ""
@@ -8680,6 +8685,11 @@ msgstr ""
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:433
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr ""
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -8750,150 +8760,150 @@ msgstr ""
 msgid "no valid recipients given\n"
 msgstr ""
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "list external keys"
 msgstr ""
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "list certificate chain"
 msgstr ""
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 msgid "import certificates"
 msgstr ""
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "export certificates"
 msgstr ""
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 msgid "create base-64 encoded output"
 msgstr ""
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr ""
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr ""
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 msgid "|FILE|write an audit log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr ""
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
 "Default operation depends on the input data\n"
 msgstr ""
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr ""
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr ""
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -8923,7 +8933,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr ""
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, c-format
 msgid "error reading input: %s\n"
 msgstr ""
@@ -8963,7 +8973,7 @@ msgstr ""
 msgid "error storing flags: %s\n"
 msgstr ""
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -9322,11 +9332,6 @@ msgstr ""
 msgid "error closing '%s': %s\n"
 msgstr ""
 
-#: dirmngr/crlcache.c:948
-#, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr ""
-
 #: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
@@ -9978,92 +9983,92 @@ msgstr ""
 msgid "usage: %s [options] "
 msgstr ""
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, c-format
 msgid "shutdown forced\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr ""
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr ""
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr ""
@@ -10424,102 +10429,102 @@ msgstr ""
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 msgid "quiet"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 msgid "|FILE|run commands from FILE on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, c-format
 msgid "line too long - skipped\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr ""
@@ -10579,12 +10584,12 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index f539155..8f2ebe3 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2020-06-09 23:10+0200\n"
 "Last-Translator: Nagy Ferenc László <nfl@nfllab.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
@@ -26,52 +26,52 @@ msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Valóban törli a kiválasztott kulcsokat? "
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "érvénytelen jelszó"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -82,28 +82,28 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "A jelszó túl hosszú!\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -113,107 +113,107 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "rossz jelszó"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "PIN too long"
 msgstr "A sor túl hosszú!\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "A jelszó túl hosszú!\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Érvénytelen karakter a névben!\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad PIN"
 msgstr "hibás MPI"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "rossz jelszó"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "jelszóváltoztatás"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: agent/command.c:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -225,9 +225,9 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d%s védő algoritmus nem támogatott.\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
@@ -235,15 +235,15 @@ 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
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -254,137 +254,128 @@ 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:2513
+#: agent/command-ssh.c:2467
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Kérem, adja meg a jelszót! Ezt egy titkos mondat. \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Ismételje meg a jelszót: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Ismételje meg a jelszót: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Ismételje meg a jelszót: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "Nem ismételte meg helyesen a jelszót! Próbálja újra!"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "Hiba a jelszó létrehozásakor: %s.\n"
-
-#: agent/genkey.c:150
+#: agent/genkey.c:154
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "�rok a \"%s\" állományba.\n"
+msgid "error writing to pipe: %s\n"
+msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "�rja be a jelszót!\n"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -392,7 +383,7 @@ msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "A név legalább 5 karakter kell legyen!\n"
 msgstr[1] "A név legalább 5 karakter kell legyen!\n"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -400,386 +391,385 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Mégis használjuk ezt a kulcsot? "
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Most szükség van egy jelszóra (vagy mondatra), amely a titkos kulcsát védi.\n"
 "\n"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "jelszóváltoztatás"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "A kulcsot lecserélték."
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "bőbeszédű mód"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "még szűkszavúbb mód"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "bizalmi adatbázis frissítése"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NÉV|terminál karakterkódolásának megadása"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "nem támogatott"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "nem támogatott"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|N. sorszámú jelszómód használata"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "gpg ügynök használata"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "A hibákat (angolul) a <gnupg-bugs@gnu.org> címre írja meg!\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "Az opciókat a \"%s\" állományból olvasom.\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "FIGYELEM: \"%s\" elavult opció!\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s nem hozható létre: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, 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:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, 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:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "�rom a titkos kulcsot a %s állományba.\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, 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:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: Könyvtárat létrehoztam.\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, 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:2385
+#: agent/gpg-agent.c:2395
 #, 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:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2832
+#: agent/gpg-agent.c:2842
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "Titkoskulcs-blokk frissítése sikertelen: %s\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
@@ -805,7 +795,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -815,7 +805,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -869,42 +859,42 @@ msgstr "Mégsem"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "Titkos kulcsrészek nem állnak rendelkezésre.\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -917,19 +907,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "igen"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -942,7 +932,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -952,48 +942,63 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "Hiba \"%s\" olvasásakor: %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 #, fuzzy
 msgid "Change passphrase"
 msgstr "jelszóváltoztatás"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1231
+#, c-format
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1741
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Valóban törli a kiválasztott kulcsokat? "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 #, fuzzy
 msgid "Delete key"
 msgstr "kulcs engedélyezése"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1015,7 +1020,7 @@ msgstr ""
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
@@ -1057,7 +1062,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@ -1119,12 +1124,12 @@ 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:905
+#: common/sysutils.c:880
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "Frissítés sikertelen: %s.\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
@@ -1352,7 +1357,7 @@ msgid "algorithm: %s"
 msgstr "Páncél: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1523,7 +1528,7 @@ msgstr "Páncélozás nem sikerült: %s\n"
 msgid "iconv_open failed: %s\n"
 msgstr "Nem tudom megnyitni az állományt: %s.\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
@@ -1562,7 +1567,7 @@ msgstr "A(z) %08lX nyilvános kulcsot nem találom: %s.\n"
 msgid "waiting for lock %s...\n"
 msgstr "�rom a titkos kulcsot a %s állományba.\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1736,7 +1741,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
@@ -1779,7 +1784,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "visszavonási igazolás készítése"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1807,7 +1812,7 @@ msgstr "Nem tudom ezt megcsinálni kötegelt módban!\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Ez a parancs %s módban nem engedélyezett.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Titkos kulcsrészek nem állnak rendelkezésre.\n"
@@ -1874,15 +1879,15 @@ msgstr "Nincs hozzá tartozó nyilvános kulcs: %s\n"
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
@@ -2230,27 +2235,27 @@ msgstr "�rom a titkos kulcsot a %s állományba.\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Érvénytelen parancs! (Próbálja a súgót: \"help\".)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opció nem működik ehhez a parancshoz.\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 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,8 +2318,8 @@ msgid "subkey"
 msgstr "Nyilvános kulcsú (pubkey): "
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Frissítés sikertelen: %s.\n"
@@ -2378,15 +2383,15 @@ msgstr ""
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "Lehet, hogy nem használhatja \"%s\" rejtjelező algoritmust %s módban!\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 sm/sign.c:597 sm/verify.c:510
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2409,7 +2414,7 @@ msgstr "A %s (%d) rejtjelező használata sérti a címzett preferenciáit!\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "FIGYELEM: \"%s\" elavult opció!\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2519,12 +2524,12 @@ msgstr "�rom a titkos kulcsot a %s állományba.\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "%08lX kulcs: PGP 2.x stílusú kulcs - kihagytam.\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "FIGYELEM: Semmit sem exportáltam.\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, fuzzy, c-format
 #| msgid "error creating `%s': %s\n"
@@ -2595,297 +2600,297 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 #, fuzzy
 msgid "make a signature"
 msgstr "különálló aláírás készítése"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fájl]|olvasható szöveg aláírása"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "különálló aláírás készítése"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "adat titkosítása"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "titkosítás csak szimmetrikus rejtjelezővel"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "adat visszafejtése (alapértelmezés)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "aláírás ellenőrzése"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "kulcsok listázása"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "kulcsok és aláírások listázása"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kulcsaláírások ellenőrzése"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "kulcsok és ujjlenyomatok listázása"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "titkos kulcsok listázása"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "visszavonási igazolás készítése"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 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:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok eltávolítása a titkoskulcs-karikáról"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "kulcs aláírása"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "kulcs aláírása helyileg"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "új kulcspár létrehozása"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "kulcs aláírása"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "kulcs aláírása helyileg"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "kulcs aláírása vagy szerkesztése"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "jelszóváltoztatás"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "kulcsok exportálása"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "kulcsok exportálása kulcsszerverre"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "kulcsok importálása kulcsszerverről"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "kulcsok keresése kulcsszerveren"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs frissítése kulcsszerverről"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "kulcsok importálása/összefűzése"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "bizalmi adatbázis frissítése"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [fájlok]|üzenet kivonatának kiírása"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 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:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "ne csináljon semmi változtatást"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "felülírás előtt rákérdezés"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "ascii páncélozott kimenet létrehozása"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 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:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "kanonikus szöveges mód használata"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|tömörítési szint beállítása N-re (0: tiltás)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "kulcsok importálása kulcsszerverről"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "kulcsaláírások ellenőrzése"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "titkos kulcsok listázása"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NÉV|titkosítás NÉV részére"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "felh. azonosító aláíráshoz és visszafejtéshez"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2893,7 +2898,7 @@ msgstr ""
 "@\n"
 "(A parancsok és opciók teljes listáját a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2923,13 +2928,13 @@ msgstr ""
 " --list-keys [nevek]        kulcsok kiíratása\n"
 " --fingerprint [nevek]      ujjlenyomatok kiíratása\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2944,7 +2949,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:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2952,572 +2957,572 @@ msgstr ""
 "\n"
 "Támogatott algoritmusok:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Nyilvános kulcsú (pubkey): "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Rejtjelező (cipher): "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Kivonatoló (hash): "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Tömörítő (compression): "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "Használat: gpg [opciók] "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "Nem találtam = jelet a \"%s\" csoportdefinícióban!\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "FIGYELEM: Nem biztonságos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "FIGYELEM: nem biztonságos engedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "FIGYELEM: nem biztonságos könyvtártulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "FIGYELEM: nem biztonságos könyvtártulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "FIGYELEM: nem biztonságos könyvtártulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "FIGYELEM: nem biztonságos könyvtárengedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "FIGYELEM: nem biztonságos könyvtárengedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "FIGYELEM: nem biztonságos könyvtárengedélyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "\"%s\": ismeretlen konfigurációs elem.\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilistázott kulcs kulcskarikáját is"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelelő aláírás a titkoskulcs-karikán.\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Ez a parancs %s módban nem engedélyezett.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "MEGJEGYZÉS: %s nem normál használatra van!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Ez nem érvényes e-mail cím.\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "Értelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Nem tudom a végrehajtási elérési utat %s értékre állítani!\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: Érvénytelen export opciók!\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "Érvénytelen import opciók!\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core állományt hozhat létre!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hatástalanítja %s-t!\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s és %s nem használható együtt!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s értelmetlen %s mellett!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "�rom a titkos kulcsot a %s állományba.\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "A kiválasztott kivonatoló algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiválasztott rejtjelező algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazoláshoz kiválasztott kivonatoló algoritmus érvénytelen!\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-nál!\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-nél!\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 1 és 255 közé kell essen!\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "Érvénytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "Érvénytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZÉS: Egyszerű S2K mód (0) erősen ellenjavallt!\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "Érvénytelen S2K mód; 0, 1 vagy 3 lehet.\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "Érvénytelen alapértelmezett preferenciák!\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "Érvénytelen személyes rejtjelező-preferenciák!\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "Érvénytelen személyes rejtjelező-preferenciák!\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "Érvénytelen személyes kivonatolópreferenciák!\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "Érvénytelen személyes tömörítőpreferenciák!\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "Kulcsméret érvénytelen; %u bitet használok.\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s és %s egyelőre nem használható együtt!\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "Lehet, hogy nem használhatja \"%s\" rejtjelező algoritmust %s módban!\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "Lehet, hogy nem használhatja \"%s\" tömörítő algoritmust %s módban!\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "FIGYELEM: Címzett megadva (-r), de nincs nyilvános kulcsú titkosítás!\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "Visszafejtés sikertelen: %s.\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "Lehet, hogy nem használhatja %s-t %s módban!\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Vétel a kulcsszerverről sikertelen: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexportálás sikertelen: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "Kulcsexportálás sikertelen: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keresés a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Frissítés a kulcsszerverről sikertelen: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Páncél eltávolítása nem sikerült: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "Érvénytelen kivonatoló algoritmus: %s\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti gépelni az üzenetet...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazolási eljárásmód URL-je érvénytelen!\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "A megadott aláírási eljárásmód URL-je érvénytelen!\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, 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"
@@ -3531,7 +3536,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|�L|állapotinformációk írása �L állományleíróra"
 
@@ -4258,7 +4263,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Biztos abban, hogy továbbra is alá akarja írni? (i/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  Nem tudom aláírni.\n"
 
@@ -4457,8 +4462,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Valóban aláírja? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Aláírás sikertelen: %s\n"
@@ -4672,7 +4677,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "A kulcsot visszavonták."
 
@@ -4725,7 +4730,7 @@ msgstr "Valóban eltávolítja ezt a felhasználóazonosítót? "
 msgid "Really move the primary key? (y/N) "
 msgstr "Valóban eltávolítja ezt a felhasználóazonosítót? "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Legalább egy kulcsot ki kell választania!\n"
@@ -4812,169 +4817,169 @@ msgstr "Mentsem a változtatásokat? "
 msgid "Quit without saving? (y/N) "
 msgstr "Kilépjek mentés nélkül? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "A kulcs nem változott, nincs szükség frissítésre.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "Nem törölheti az utolsó felhasználóazonosítót!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Érvénytelen érték!\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Nincs ilyen felhasználói azonosító.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Nincs mit aláírni a %08lX kulccsal!\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   aláírva %08lX által %s%s időpontban.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s nem érvényes karakterkiosztás!\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Jellemzők: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 #, fuzzy
 msgid "Notations: "
 msgstr "Jelölés: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nincsenek preferenciák egy PGP 2.x felhasználóazonosítón!\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Ezt a kulcsot a következő %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Ezt a kulcsot a következő %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (érzékeny)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozható létre: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lejár: %s]"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lejár: %s]"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4982,19 +4987,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5003,18 +5008,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:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Nem változtathatja meg egy v3 kulcs lejárati dátumát!\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5024,35 +5029,35 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verziói visszautasítják ezt a kulcsot.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Továbbra is hozzá akarja adni? (i/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Lehet, hogy nem adhat fotóazonosítót egy PGP2 stílusú kulcshoz!\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Törli ezt a jó aláírást? (i/N/k)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Törli ezt az érvénytelen aláírást? (i/N/k)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Törli ezt az ismeretlen aláírást? (i/N/k)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Valóban törli ezt az önaláírást? (i/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5060,38 +5065,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:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Nem töröltem semmit.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 #, fuzzy
 msgid "invalid"
 msgstr "érvénytelen páncél"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "\"%s\" felhasználói azonosítót visszavonták."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5101,224 +5106,224 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verziók visszautasítják ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Lehet, hogy nem adhat kijelölt visszavonót egy PGP 2.x-stílusú kulcshoz.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�rja be a kijelölt visszavonó felhasználóazonosítóját: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "Nem adhat meg PGP 2.x stílusú kulcsot kijelölt visszavonónak!\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Nem adhat meg egy kulcsot saját kijelölt visszavonójának!\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "FIGYELEM: Ezt a kulcsot a kijelölt visszavonó visszavonta!\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "FIGYELEM: A kijelölt visszavonó kulcs megadása nem csinálható vissza!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Biztosan ez a kulcs legyen a kijelölt visszavonó? (i/N): "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "Biztosan ez a kulcs legyen a kijelölt visszavonó? (i/N): "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Másodlagos kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Elsődleges kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem változtathatja meg egy v3 kulcs lejárati dátumát!\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Másodlagos kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Elsődleges kulcs lejárati idejének változtatása.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "FIGYELEM: %08lX aláíró alkulcs nem kereszthitelesített.\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Kérem, válasszon ki pontosan egy felhasználóazonosítót!\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Kihagyom a v3 önaláírást a \"%s\" felhasználóazonosítón.\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy használni akarja (i/N)? "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy használni akarja (i/N)? "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Aláírás-jelölés: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Felülírjam (i/N)? "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d indexű felhasználóazonosító!\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhasználóazonosító: \""
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   aláírva %08lX által %s%s%s időpontban.\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (nem exportálható)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az aláírás lejárt %s időpontban.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy mégis visszavonja? (i/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Csináljunk egy visszavonó igazolást ehhez az aláíráshoz? (i/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Ön aláírta a következő felhasználóazonosítókat:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem exportálható)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX által %s időpontban.\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "A következő aláírásokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Valóban létrehozzam a visszavonó igazolást? (i/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "FIGYELEM: A felhasználóazonosítót %d másodperccel a jövőben írták alá.\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Nem törölheti az utolsó felhasználóazonosítót!\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "\"%s\" felhasználói azonosítót már visszavonták.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, 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"
@@ -5747,6 +5752,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Kérem, ne rakja az e-mail címet a teljes névbe vagy a megjegyzésbe!\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -6076,57 +6085,57 @@ msgstr "Érvénytelen export opciók!\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
 msgstr[1] "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom törölni az (\"%s\") átmeneti állományt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "\"%s\" kulcs nem található: %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "Érvénytelen export opciók!\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "Kihagytam \"%s\"-t: %s.\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "Aláírva az Ön %08lX kulcsával %s időpontban.\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "Lekérem a %08lX kulcsot a %s kulcsszerverről.\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
@@ -6160,254 +6169,254 @@ msgstr "Ismeretlen algoritmussal (%d) titkosítva.\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkosítva.\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Nyilvános kulcs: %08lX\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "Titkosítva %u bites %s kulccsal, azonosító: %08lX, létrehozva: %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Titkosítva %s kulccsal, azonosító: %08lX\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu jelszóval rejtjelezve\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 jelszóval rejtjelezve\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Nyilvános kulcsú visszafejtés sikertelen: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "Nyilvános kulccsal titkosított adat: jó DEK.\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s titkosított adatot feltételezek.\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA rejtjelező nem áll rendelkezésre, optimista módon megpróbálok\n"
 "%s-t használni helyette.\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "FIGYELEM: Az üzenetet nem látták el integritásvédelemmel.\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "Visszafejtés sikertelen: %s.\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "Visszafejtés rendben.\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "FIGYELEM: A titkosított üzenetet manipulálták!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Visszafejtés sikertelen: %s.\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "MEGJEGYZÉS: A feladó kérése: \"csak az Ön szemeinek\".\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Eredeti fájlnév: '%.*s'.\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Különálló visszavonás. Használja a \"gpg --import\"-ot az alkalmazásához!\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Jó aláírás a következőtől: \""
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ROSSZ aláírás a következőtől: \""
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Lejárt aláírás a következőtől: \""
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Jó aláírás a következőtől: \""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "Aláírás-ellenőrzés elnyomva.\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "Nem tudom kezelni ezeket a többszörös aláírásokat!\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Aláírva: %.*s; kulcs: %s, %08lX.\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Kulcs található: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[bizonytalan]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               azaz \""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "FIGYELEM: Ez a kulcs nincs hitelesítve megbízható aláírással!\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Az aláírás lejárt: %s.\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Az aláírás lejár: %s.\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "Bináris"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "Szövegmódú"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "Ismeretlen módú"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "ismeretlen nyilvános kulcsú algoritmus"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellenőrizni az aláírást: %s.\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "Nem különálló aláírás.\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "FIGYELEM: Többszörös aláírást érzékeltem. Csak az elsőt ellenőrzöm.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x osztályú különálló aláírás.\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Régi stílusú (PGP 2.x) aláírás.\n"
@@ -6483,11 +6492,6 @@ msgstr ""
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: Elavult opció: \"%s\"\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "FIGYELEM: \"%s\" elavult opció!\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7582,134 +7586,134 @@ msgstr "Olvasási hiba: %s.\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "Bizalmi adatbázis: szinkronizáció sikertelen: %s.\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "Nem tudom létrehozni a(z) \"%s\" állományt: %s.\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "Bizalmi adatbázis %lu. rekord: lseek sikertelen: %s.\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "Bizalmi adatbázis %lu. rekord: írás sikertelen (n=%d): %s.\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "Bizalmi adatbázis tranzakciója túl nagy.\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Könyvtár nem létezik!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "Nem tudom bezárni a(z) \"%s\" állományt: %s.\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: Nem sikerült verziórekordot létrehoznom: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: Érvénytelen bizalmi adatbázis jött létre.\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: Bizalmi adatbázis létrejött.\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "MEGJEGYZÉS: Bizalmi adatbázis nem írható.\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: Érvénytelen bizalmi adatbázis.\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: Hashtábla létrehozása sikertelen: %s.\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Hiba a verziórekord frissítésekor: %s.\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Hiba a verziórekord olvasásakor: %s.\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Hiba a verziórekord írásakor: %s.\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "Bizalmi adatbázis: lseek sikertelen: %s.\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "Bizalmi adatbázis: olvasás sikertelen (n=%d): %s.\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: Nem bizalmi adatbázis.\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: Verziórekord, rekordszám: %lu.\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: Érvénytelen állományverzió (%d).\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Hiba könyvtárrekord írásakor: %s.\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: Nem sikerült egy rekord nullázása: %s.\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: Nem sikerült egy rekord hozzáadása: %s.\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: Bizalmi adatbázis létrejött.\n"
@@ -8332,16 +8336,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8376,10 +8380,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8399,158 +8403,158 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "\"%s\" már tömörített.\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "új kulcspár létrehozása"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "új kulcspár létrehozása"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "kulcsok eltávolítása a nyilvánoskulcs-karikáról"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "Kulcsgenerálás sikertelen: %s\n"
 msgstr[1] "Kulcsgenerálás sikertelen: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Kérem, válassza ki a visszavonás okát:\n"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "jelszóváltoztatás"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Megjegyzés: Ez a kulcs le lett tiltva.\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "jelszóváltoztatás"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Kérem, válassza ki a visszavonás okát:\n"
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "Bizalmi adatbázis (%s) inicializálása sikertelen!\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "Nem tudtam újraépíteni a kulcskarika cache-ét: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
@@ -8558,43 +8562,43 @@ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Küldés a kulcsszerverre sikertelen: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8602,22 +8606,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Kérem, válassza ki a visszavonás okát:\n"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8625,81 +8629,81 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "jelszóváltoztatás"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "Hiba a kulcsblokk olvasásakor: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: Hiba szabad rekord olvasásakor: %s.\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "nem támogatott URI"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s aláírás, %s kivonatoló algoritmus.\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem találtam érvényes OpenPGP adatot.\n"
@@ -8720,7 +8724,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8769,33 +8773,33 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "Egymásnak ellentmondó parancsok!\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
@@ -9029,7 +9033,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "A létrehozott aláírás ellenőrzése sikertelen: %s.\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
@@ -9084,7 +9088,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -9132,42 +9136,42 @@ msgstr ""
 "\"%.*s\"\n"
 "%u bites %s key, azonosító: %08lX, létrehozva: %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "rossz igazolás"
@@ -9361,6 +9365,11 @@ msgstr "Csináljunk egy visszavonó igazolást ehhez a kulcshoz? "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:433
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "Hiba a jelszó létrehozásakor: %s.\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9433,134 +9442,134 @@ msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 msgid "no valid recipients given\n"
 msgstr "(Nincs leírás.)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "list external keys"
 msgstr "titkos kulcsok listázása"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 #, fuzzy
 msgid "list certificate chain"
 msgstr "rossz igazolás"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 #, fuzzy
 msgid "import certificates"
 msgstr "rossz igazolás"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "export certificates"
 msgstr "rossz igazolás"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "ne használja a terminált egyáltalán"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ascii páncélozott kimenet létrehozása"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NÉV|NÉV használata alapértelmezett titkos kulcsként"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "kulcskarika hozzáadása a kulcskarikalistához"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NÉV|NÉV rejtjelező algoritmus haszn. jelszavakhoz"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NÉV|NÉV rejtjelező algoritmus használata"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NÉV|NÉV kivonatoló algoritmus használata"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "kötegelt mód: soha nem kérdez"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "igen válasz feltételezése a legtöbb kérdésre"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "nem válasz feltételezése a legtöbb kérdésre"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9571,27 +9580,27 @@ 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"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Nem tudok kapcsolódni \"%s\" objektumhoz: %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "�rok a \"%s\" állományba.\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "Nem tudom bezárni a(z) \"%s\" állományt: %s.\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9621,7 +9630,7 @@ msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 msgid "error importing certificate: %s\n"
 msgstr "Hiba a jelszó létrehozásakor: %s.\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@ -9661,7 +9670,7 @@ msgstr "rev? Nem tudom ellenőrizni a visszavonást: %s.\n"
 msgid "error storing flags: %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -10028,12 +10037,6 @@ msgstr "Nem tudom a \"%s\" könyvtárat létrehozni: %s.\n"
 msgid "error closing '%s': %s\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/crlcache.c:948
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "Hiba \"%s\" olvasásakor: %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
@@ -10721,93 +10724,93 @@ msgstr ""
 msgid "usage: %s [options] "
 msgstr "Használat: gpg [opciók] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s és %s nem használható együtt!\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "Páncélozás nem sikerült: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "A sor túl hosszú!\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "Hiba: Érvénytelen ujjlenyomat.\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "Olvasási hiba: %s.\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "nem feldolgozott"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "Túl sok \"%c\" preferencia.\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11178,105 +11181,105 @@ msgstr "%c%lu preferencia kétszer szerepel!\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "kilépés|kilepes"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|fájl|bővítő modul betöltése"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Használat: gpg [opciók] [fájlok] (-h a súgóhoz)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "A kulcsblokk törlése sikertelen: %s.\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "A sor túl hosszú!\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "Ismeretlen alapértelmezett címzett: \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "Aláírás sikertelen: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "GPG ügynök nem elérhető ebben a munkafolyamatban.\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "Hiba %s-ra/-re küldéskor: %s\n"
@@ -11342,12 +11345,12 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "Hiba \"%s\" olvasásakor: %s\n"
@@ -11537,6 +11540,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "�rok a \"%s\" állományba.\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "A kulcsot lecserélték."
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "A név lehet, hogy nem kezdődhet számmal!\n"
 
@@ -11798,10 +11810,6 @@ msgstr ""
 #~ msgstr "Nem tudom megnyitni %s-t: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "Hiba a \"%s\" kulcskarika írásakor: %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "Hiba \"%s\" olvasásakor: %s\n"
 
diff --git a/po/id.po b/po/id.po
index de78211..d35ea87 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
@@ -31,52 +31,52 @@ msgstr "gagal inisialisasi TrustDB: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "passphrase tidak valid"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -87,28 +87,28 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "passphrase terlalu panjang\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -118,107 +118,107 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase yang buruk"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "PIN too long"
 msgstr "baris terlalu panjang\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase terlalu panjang\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI yang buruk"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase yang buruk"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "ubah passphrase"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/command.c:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -230,9 +230,9 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
@@ -240,15 +240,15 @@ msgstr "tidak dapat membuat %s: %s\n"
 
 #: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -259,137 +259,128 @@ 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:2513
+#: agent/command-ssh.c:2467
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Ulangi passphrase: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Ulangi passphrase: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Ulangi passphrase: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "kesalahan penciptaan passphrase: %s\n"
-
-#: agent/genkey.c:150
+#: agent/genkey.c:154
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "menulis ke `%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Masukkan passphrase\n"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -397,7 +388,7 @@ msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "Nama harus berukuran minimum 5 karakter\n"
 msgstr[1] "Nama harus berukuran minimum 5 karakter\n"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -405,386 +396,385 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Tetap gunakan kunci ini? "
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "ubah passphrase"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "Kunci dilampaui"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "detil"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "perbarui database trust"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "tidak didukung"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "tidak didukung"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|gunakan passphrase mode N"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "gunakan gpg-agent"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Laporkan bug ke <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, 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:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, 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:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2832
+#: agent/gpg-agent.c:2842
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: dilewati: %s\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
@@ -810,7 +800,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -820,7 +810,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -874,42 +864,42 @@ msgstr "Batal"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -922,19 +912,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "y|ya"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -947,7 +937,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -957,48 +947,63 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "kesalahan membaca `%s': %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 #, fuzzy
 msgid "Change passphrase"
 msgstr "ubah passphrase"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1231
+#, c-format
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1741
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 #, fuzzy
 msgid "Delete key"
 msgstr "aktifkan kunci"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1020,7 +1025,7 @@ msgstr ""
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
@@ -1062,7 +1067,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -1124,12 +1129,12 @@ 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:905
+#: common/sysutils.c:880
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
@@ -1357,7 +1362,7 @@ msgid "algorithm: %s"
 msgstr "armor: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1528,7 +1533,7 @@ msgstr "gagal enarmoring: %s\n"
 msgid "iconv_open failed: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
@@ -1567,7 +1572,7 @@ msgstr "kunci publik %08lX tidak ditemukan: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1742,7 +1747,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
@@ -1785,7 +1790,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1813,7 +1818,7 @@ msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
@@ -1880,15 +1885,15 @@ msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
@@ -2236,27 +2241,27 @@ msgstr "menulis kunci rahasia ke `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 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,8 +2324,8 @@ msgid "subkey"
 msgstr "Pubkey: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
@@ -2384,15 +2389,15 @@ msgstr ""
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 sm/sign.c:597 sm/verify.c:510
 #, fuzzy, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2415,7 +2420,7 @@ msgstr "memaksa cipher simetrik %s (%d) melanggar preferensi penerima\n"
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2525,12 +2530,12 @@ msgstr "menulis kunci rahasia ke `%s'\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kunci %08lX: kunci gaya PGP 2.x - dilewati\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, fuzzy, c-format
 #| msgid "error creating `%s': %s\n"
@@ -2599,297 +2604,297 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 #, fuzzy
 msgid "make a signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "ubah passphrase"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "ekspor kunci ke keyserver"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "impor kunci dari keyserver"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "cari kunci di keyserver"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "impor kunci dari keyserver"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2897,7 +2902,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2927,13 +2932,13 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2948,7 +2953,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2956,574 +2961,574 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -3537,7 +3542,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
@@ -4261,7 +4266,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "..Tidak dapat menandai.\n"
 
@@ -4463,8 +4468,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
@@ -4678,7 +4683,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan"
 
@@ -4731,7 +4736,7 @@ msgstr "Hapus ID user ini? "
 msgid "Really move the primary key? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
@@ -4818,169 +4823,169 @@ msgstr "Simpan perubahan? "
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Tidak ada ID user tersebut.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Tidak ada yang ditandai dengan kunci %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   ditandai oleh %08lX pada %s%s\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 #, fuzzy
 msgid "Notations: "
 msgstr "Notasi: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4988,19 +4993,19 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5009,18 +5014,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:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5030,35 +5035,35 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5066,38 +5071,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Menghapus %d signature.\n"
 msgstr[1] "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5107,46 +5112,46 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan "
 "sendiri\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "PERINGATAN: menunjuk sebuah kunci sebagai pihak yang dibatalkan tidak dapat "
 "dilakukan\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
@@ -5154,181 +5159,181 @@ msgid ""
 msgstr ""
 "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "melewati self-signature v3 pada user id \"%s\"\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notasi signature: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "PERINGATAN: signature user ID bertanggal %d detik di masa depan\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, 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"
@@ -5755,6 +5760,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -6086,56 +6095,56 @@ msgstr "opsi ekspor tidak valid\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "meminta kunci %08lX dari %s\n"
 msgstr[1] "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "melewati `%s': %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
@@ -6168,253 +6177,253 @@ msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "dienkripsi dengan passphrase %lu\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "dienkripsi dengan 1 passphrase\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "asumsikan %s data terenkripsi\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cipher IDEA tidak tersedia, secara optimis berusaha menggunakan %s\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature membuat %.*s menggunakan kunci %s ID %08lX\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Kunci tersedia di:"
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 "PERINGATAN: Kunci ini tidak disertifikasi dengan sig yang terpercaya!\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "biner"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "tidak dikenal"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritma pubkey tidak dikenal"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "PERINGATAN: multi signature terdeteksi. Hanya yang pertama akan diperiksa.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
@@ -6486,11 +6495,6 @@ msgstr ""
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7582,134 +7586,134 @@ msgstr "kesalahan pembacaan: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: gagal sync: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek gagal: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: write failed (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "transaksi trustdb terlalu besar\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: direktori tidak ada!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: gagal membuat catatan versi: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: tercipta trustdb tidak valid\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tercipta trustdb\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "CATATAN: trustdb tidak dapat ditulisi\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb tidak valid\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: kesalahan memperbaharui catatan versi: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: kesalahan membaca catatan versi: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: kesalahan menulis catatan versi: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek gagal: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bukan file trustdb\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: catatan versi dengan recnum %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi file %d tidak valid\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: kesalahan menulis dir record: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: gagal mengosongkan record: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: gagal menambahkan record: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: tercipta trustdb\n"
@@ -8331,16 +8335,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8375,10 +8379,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8398,158 +8402,158 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "hapus kunci dari keyring publik"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "Pembuatan kunci gagal: %s\n"
 msgstr[1] "Pembuatan kunci gagal: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "ubah passphrase"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Catatan: Kunci ini telah ditiadakan\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "ubah passphrase"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
@@ -8557,43 +8561,43 @@ msgstr "gagal menghapus keyblok: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8601,22 +8605,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8624,81 +8628,81 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI tidak didukung"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@ -8719,7 +8723,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8768,33 +8772,33 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "perintah saling konflik\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
@@ -9028,7 +9032,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
@@ -9083,7 +9087,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -9130,42 +9134,42 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "sertifikat yang buruk"
@@ -9360,6 +9364,11 @@ msgstr "Buat sertifikat pembatalan untuk kunci ini?"
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:433
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "kesalahan penciptaan passphrase: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9432,134 +9441,134 @@ msgstr "gagal menghapus keyblok: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "list external keys"
 msgstr "tampilkan kunci rahasia"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 #, fuzzy
 msgid "list certificate chain"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 #, fuzzy
 msgid "import certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "export certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ciptakan output ascii"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9570,27 +9579,27 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9620,7 +9629,7 @@ msgstr "kesalahan penciptaan passphrase: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -9660,7 +9669,7 @@ msgstr "rev? masalah memeriksa pembatalan: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -10027,12 +10036,6 @@ msgstr "tidak dapat membuat direktori `%s': %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/crlcache.c:948
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "kesalahan membaca `%s': %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
@@ -10720,93 +10723,93 @@ msgstr ""
 msgid "usage: %s [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "baris terlalu panjang\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "tidak diproses"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "terlalu banyak preferensi `%c'\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11177,105 +11180,105 @@ msgstr "preferensi %c%lu ganda \n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "q|k|keluar"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "baris terlalu panjang\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "gagal menandai: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
@@ -11341,12 +11344,12 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -11536,6 +11539,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "menulis ke `%s'\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "Kunci dilampaui"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Nama tidak boleh dimulai dengan digit\n"
 
@@ -11797,10 +11809,6 @@ msgstr ""
 #~ msgstr "tidak dapat membuka %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "kesalahan menulis keyring `%s': %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "kesalahan membaca `%s': %s\n"
 
diff --git a/po/it.gmo b/po/it.gmo
index b8d277a..832e932 100644
--- a/po/it.gmo
+++ b/po/it.gmo
diff --git a/po/it.po b/po/it.po
index 6b2b8b5..f2a2999 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2021-04-15 10:09+0900\n"
 "Last-Translator: Denis <student@alice.it>\n"
 "Language-Team: \n"
@@ -16,7 +16,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.4.2\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "impossibile acquisire il blocco pinentry: %s\n"
@@ -27,49 +27,49 @@ msgstr "impossibile acquisire il blocco pinentry: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Cancel"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Yes"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Save in gestione password"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Vuoi davvero rendere la tua passphrase visibile sullo schermo?"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Rendere visibile la passphrase"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Nascondi passphrase"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr "Suggerisci"
 
@@ -80,21 +80,21 @@ msgstr "Suggerisci"
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr "pinentry.genpin.tooltip"
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -102,7 +102,7 @@ msgstr "Passphrase troppo lunga"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Qualità:"
 
@@ -112,11 +112,11 @@ msgstr "Qualità:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -124,7 +124,7 @@ msgstr ""
 "Inserisci il tuo PIN, in modo che la chiave segreta possa essere sbloccata "
 "per questa sessione"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -132,76 +132,76 @@ msgstr ""
 "Inserisci la tua passphrase, in modo che la chiave segreta possa essere "
 "sbloccata per questa sessione"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "non corrisponde - riprova"
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (provare %d di %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr "Ripeti:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 msgid "PIN too long"
 msgstr "PIN troppo lungo"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 msgid "Passphrase too long"
 msgstr "Passphrase troppo lunga"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 msgid "Invalid characters in PIN"
 msgstr "Caratteri non validi nel PIN"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr "PIN troppo corto"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad PIN"
 msgstr "PIN non valido"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad Passphrase"
 msgstr "Passphrase non valido"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr "Nota: richiesta dal browser Web."
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr "Nota: richiesta da un sito remoto."
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Inserisci di nuovo questa passphrase"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, 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:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -224,24 +224,24 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "le chiavi ssh maggiori di %d bit non sono supportate\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, 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
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, 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:2513
+#: agent/command-ssh.c:2467
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "errore durante il recupero dell'elenco delle schede: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, 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:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Permettere"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Rifiutare"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Immettere la passphrase per la chiave ssh%%0A %F%%0A (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -287,88 +287,80 @@ 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:3708
+#: agent/command-ssh.c:3797
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "impossibile creare il flusso dal socket: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Inserire la scheda con il numero di serie"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "PIN amministratore"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Resetta codice"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr "Premere il pulsante ACK sulla scheda/token."
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr "Utilizzare il pinpad del lettore per l'input."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Ripeti questo codice di reimpostazione"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Ripeti questo PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Ripeti questo PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Reimpostare il codice non ripetuto correttamente; Riprova"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK non ripetuto correttamente; Riprova"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN non ripetuto correttamente; Riprova"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Immettere il PIN%s%s%s per sbloccare la scheda"
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "errore durante la creazione del file temporaneo: %s\n"
-
-#: agent/genkey.c:150
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "errore durante la scrittura nel file temporaneo: %s\n"
+#: agent/genkey.c:154
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "errore durante la scrittura in %s: %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 msgid "Enter new passphrase"
 msgstr "Inserisci la nuova passphrase"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 "Non è stata immessa una passphrase!%0AUna passphrase vuota non è consentita."
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -378,18 +370,18 @@ msgstr ""
 "prega di confermare che non si desidera disporre di alcuna protezione sulla "
 "chiave."
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr "Sì, la protezione non è necessaria"
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "Una passphrase deve avere almeno lunga %u carattere."
 msgstr[1] "Una passphrase deve avere almeno lunga %u caratteri."
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -399,234 +391,230 @@ msgstr[0] ""
 msgstr[1] ""
 "Una passphrase deve contenere almeno %u cifre o%%0Acaratteri speciali."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Una passphrase non può essere un termine noto o corrispondere%%0Acertain "
 "modello."
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Avviso: è stata immessa una passphrase non sicura."
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 msgid "Take this one anyway"
 msgstr "Prendi questo comunque"
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Immettere la passphrase a%0Aproteggere la nuova chiave"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 msgid "Please enter the new passphrase"
 msgstr "Inserisci la nuova passphrase"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 msgid "Options used for startup"
 msgstr "Opzioni utilizzate per l'avvio"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr "eseguire in modalità daemon (sfondo)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr "eseguire in modalità server (in primo piano)"
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-msgid "run in supervised mode"
-msgstr "eseguire in modalità supervisionata"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr "non scollegarsi dalla console"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr "uscita del comando sh-stile"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr "uscita del comando in csh-stile"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|opzioni di lettura da FILE"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr "Opzioni che controllano l'output diagnostico"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "prolisso"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|scrittura dei registri in modalità server in FILE"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr "Opzioni che controllano la configurazione"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "non utilizzare il SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "| PGM| utilizzare PGM come programma SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|utilizzare PGM come programma tpm2daemon"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|accettare alcuni comandi tramite NAME"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignorare le richieste di modifica del TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignorare le richieste di modifica della visualizzazione X"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "abilitare il supporto ssh"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|usa ALGO per mostrare le impronte digitali ssh"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "abilitare il supporto putty"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 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:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|scadenza PIN memorizzati nella cache dopo N secondi"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|Chiavi SSH di N-scadenza dopo N secondi"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|imposta la durata massima della cache del PIN su N secondi"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|set durata massima del tasto SSH su N secondi"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr "non utilizzare la cache PIN durante la firma"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 msgid "disallow the use of an external password cache"
 msgstr "non consentire l'uso di una cache di password esterna"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 "non consentire ai client di contrassegnare le chiavi come \"attendibili\""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 msgid "allow presetting passphrase"
 msgstr "consentire la preimpostazione della passphrase"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr "Opzioni che applicano un criterio di passphrase"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr "non consentire l'esclusione dei criteri di passphrase"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|Lunghezza minima richiesta per le nuove passphrase su N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|Per una nuova passphrase è necessario almeno N caratteri non alfa"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE||controlla le nuove passphrase rispetto al modello in FILE"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 msgid "|N|expire the passphrase after N days"
 msgstr "| La passphrase dopo N giorni"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 msgid "do not allow the reuse of old passphrases"
 msgstr "non consentono il riutilizzo di vecchie passphrase"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "Options controlling the PIN-Entry"
 msgstr "Opzioni che controllano la voce PIN"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 msgid "never use the PIN-entry"
 msgstr "non utilizzare mai la voce PIN-Entry"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr "non consentire al chiamante di eseguire l'override del pinentry"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "lasciare che PIN-Entry prenda la tastiera e mouse"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "| PGM|utilizzare PGM come programma PIN-Entry"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|Il timeout di Pinentry è impostato su N secondi"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "consentire la passphrase tramite Emacs"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Segnalare i bug a <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Utilizzo: @GPG_AGENT@ [opzioni] (-h per assistenza)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -634,131 +622,136 @@ msgstr ""
 "Sintassi: @GPG_AGENT@ [opzioni] [comando [args]]\n"
 "Gestione delle chiavi segrete per @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "'%s' a livello di debug non valido specificato\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "opzioni di lettura da '%s'\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossibile creare il socket: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "il nome socket '%s' è troppo lungo\n"
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, 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:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, 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:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "impossibile impostare le autorizzazioni di '%s': %s\n"
 
-#: agent/gpg-agent.c:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "ascolto sul socket '%s'\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "impossibile creare la directory '%s': %s\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "directory '%s' creata\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() non riuscito per '%s': %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "impossibile utilizzare '%s' come home directory\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, 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:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "gestore 0x%lx per fd %d avviato\n"
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "gestore 0x%lx per fd %d terminato\n"
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, 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:2832
+#: agent/gpg-agent.c:2842
 #, 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:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect non riuscito: %s - 1s in attesa\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s arrestato\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "nessun gpg-agent in esecuzione in questa sessione\n"
@@ -783,7 +776,7 @@ msgstr ""
 "Sintassi: gpg-preset-passphrase [opzioni] KEYGRIP\n"
 "Manutenzione della cache delle password\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -793,7 +786,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -850,42 +843,42 @@ msgstr "annullato\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "errore durante la richiesta della passphrase: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "errore durante l'apertura di '%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "file '%s', riga %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "istruzione \"%s\" ignorata in '%s', riga %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "elenco di attendibilità del sistema '%s' non disponibile\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "impronta digitale non valido in '%s', riga %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "keyflag non valido in '%s', riga %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "errore durante la lettura di '%s', riga %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -899,7 +892,7 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -908,11 +901,11 @@ msgstr ""
 "Alla fine ti fidi di %% 0A \"% s\" %%0Aper certificare correttamente i "
 "certificati utente?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 msgid "Yes"
 msgstr "Sì"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -925,7 +918,7 @@ msgstr "No"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -937,22 +930,27 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr "Corretto"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr "Sbagliato"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "errore durante la ridenominazione di '%s' in '%s': %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Nota: questa passphrase non è mai stata modificata.%0ASi prega di cambiarlo "
 "ora."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -961,15 +959,29 @@ msgstr ""
 "Questa passphrase non è stata modificata%%0Ada %.4s-%.2s-%.2s.  Si prega di "
 "cambiarlo ora."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 msgid "Change passphrase"
 msgstr "Modifica passphrase"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr "Lo cambierò più tardi"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr "Inserire la scheda con il numero di serie"
+
+#: 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?"
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+"Un processo ssh ha richiesto l'utilizzo della chiave%%0A  %s%%0A  (%s)%%0ASi "
+"desidera consentire questa operazione?"
+
+#: agent/findkey.c:1741
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -977,11 +989,11 @@ msgid ""
 msgstr ""
 "Si desidera eliminare la chiave identificata da keygrip%%0A %s%%0A %%C%%0A?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 msgid "Delete key"
 msgstr "Elimina chiave"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1006,7 +1018,7 @@ msgstr "La chiave %s utilizza un hash unsafe (%u bit)\n"
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "un hash di bit %zu non è valido per una chiave %u bit %s\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
@@ -1045,7 +1057,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "errore durante il processo di forking: %s\n"
@@ -1106,12 +1118,12 @@ 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:905
+#: common/sysutils.c:880
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "in attesa che il file '%s' diventi accessibile …\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "ridenominazione di '%s' in '%s' non riuscita: %s\n"
@@ -1328,7 +1340,7 @@ msgid "algorithm: %s"
 msgstr "algoritmo: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "algoritmo non supportato: %s"
@@ -1485,7 +1497,7 @@ msgstr "conversione da '%s' a '%s' non disponibile\n"
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open non riuscito: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "conversione da '%s' a '%s' non riuscita: %s\n"
@@ -1524,7 +1536,7 @@ msgstr "blocco '%s' non effettuato: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "attesa del blocco %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s è troppo vecchio (è necessario %s, con %s)\n"
@@ -1693,7 +1705,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "nessun dirmngr in esecuzione in questa sessione\n"
@@ -1733,7 +1745,7 @@ 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:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, c-format
 msgid "Note: %s\n"
 msgstr "Nota: %s\n"
@@ -1760,7 +1772,7 @@ msgstr "impossibile eseguire questa operazione in modalità batch\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Questo comando è disponibile solo per le schede della versione 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Reimposta codice non più disponibile o meno\n"
@@ -1825,14 +1837,14 @@ msgstr "URL per recuperare la chiave pubblica: "
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "errore durante la lettura di '%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
@@ -2168,26 +2180,26 @@ msgstr "I comandi di amministrazione non sono consentiti\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "impossibile aprire '%s'\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave \"%s\" non trovata: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 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,8 +2263,8 @@ msgid "subkey"
 msgstr "sottochiave"
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
@@ -2314,15 +2326,15 @@ msgstr ""
 msgid "(use option \"%s\" to override)\n"
 msgstr "(utilizzare l'opzione \"%s\" per ignorare)\n"
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "l'algoritmo di crittografia '%s' non può essere utilizzato in modalità %s\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2345,7 +2357,7 @@ 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:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2450,12 +2462,12 @@ msgstr "esportazione di chiavi segrete non consentita\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chiave %s: chiave di stile PGP 2.x - ignorata\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non è stato esportato nulla\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, c-format
 msgid "error creating '%s': %s\n"
@@ -2520,270 +2532,270 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "valori validi per l'opzione '%s':\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 msgid "make a signature"
 msgstr "fare una firma"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "make a clear text signature"
 msgstr "creare una firma di testo non crittografato"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr "elencare e controllare le firme delle chiavi"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 msgid "quickly generate a new key pair"
 msgstr "generare rapidamente una nuova coppia di chiavi"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "quickly add a new user-id"
 msgstr "aggiungere rapidamente un nuovo id utente"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 msgid "quickly revoke a user-id"
 msgstr "revocare rapidamente un id utente"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly set a new expiration date"
 msgstr "impostare rapidamente una nuova data di scadenza"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr "generazione completa della coppia di chiavi in primo piano"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "quickly sign a key"
 msgstr "firmare rapidamente un tasto"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "quickly sign a key locally"
 msgstr "firmare rapidamente una chiave localmente"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 msgid "quickly revoke a key signature"
 msgstr "revocare rapidamente una firma chiave"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "esporta le chiavi a un keyserver"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "importa le chiavi da un keyserver"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "cerca delle chiavi su un keyserver"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un keyserver"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr "stampare lo stato della scheda"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr "modificare i dati su una scheda"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr "modificare il PIN di una carta"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid "print message digests"
 msgstr "stampare digest dei messaggi"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "eseguire in modalità server"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALORE|impostare il criterio TOFU per una chiave"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|usa NAME come chiave segreta predefinita"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "Anche nome-crittografare all'ID utente NOME"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|configurare gli alias di posta elettronica"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr "utilizzare un comportamento OpenPGP rigoroso"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr "Opzioni che controllano l'input"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr "Opzioni che controllano l'output"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|scrittura dell'output in FILE"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|Impostare il livello di compressione su N (0 disabilita)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 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:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 "|MECHANISMS|utilizzare MECHANISMS per individuare le chiavi in base "
 "all'indirizzo di posta elettronica"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 msgid "import missing key from a signature"
 msgstr "importare la chiave mancante da una firma"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 msgid "include the public key in signatures"
 msgstr "includere la chiave pubblica nelle firme"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "disabilitare tutti gli accessi al dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr "Opzioni di controllo delle inserzioni chiave"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 msgid "Options to specify keys"
 msgstr "Opzioni per specificare le chiavi"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|encrypt per USER-ID"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|utilizzare USER-ID per firmare o decrittografare"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr "Opzioni per l'uso automatico"
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr "Altre Opzioni"
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2791,7 +2803,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2811,11 +2823,11 @@ msgstr ""
 " --list-keys [nomi]       mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Utilizzo: @GPG@ [opzioni] [file] (-h per assistenza)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2825,7 +2837,7 @@ msgstr ""
 "Firmare, controllare, crittografare o decrittografare\n"
 "Il funzionamento predefinito dipende dai dati di input\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2833,73 +2845,73 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "utilizzo: %s [opzioni] %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "nessun segno = trovato nella definizione di gruppo '%s'\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVVISO: proprietà non sicura su homedir '%s'\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "AVVISO: proprietà non sicura nel file di configurazione '%s'\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVVISO: proprietà non sicura nell'estensione '%s'\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVVISO: proprietà non sicura su homedir '%s'\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "AVVISO: autorizzazioni non sicure per il file di configurazione '%s'\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVVISO: autorizzazioni non sicure per l'estensione '%s'\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "AVVISO: proprietà non sicura su homedir '%s'\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2907,21 +2919,21 @@ msgstr ""
 "AVVISO: proprietà della directory di inclusione non sicura nel file di "
 "configurazione '%s'\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "AVVISO: proprietà della directory di inclusione non sicura nell'estensione "
 "'%s'\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "AVVISO: autorizzazioni della directory di inclusione non sicure nella "
 "directory homedir '%s'\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2929,480 +2941,480 @@ msgstr ""
 "AVVISO: autorizzazioni della directory di inclusione non sicure nella "
 "directory homedir '%s'\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "AVVISO: autorizzazioni della directory di inclusione non sicure per "
 "l'estensione '%s'\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "elemento di configurazione sconosciuto '%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr "visualizzare gli ID foto durante le elenchi dei tasti"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 msgid "show key usage information during key listings"
 msgstr ""
 "mostra le informazioni sull'utilizzo delle chiavi durante le inserzioni "
 "chiave"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr "mostra URL dei criteri durante gli elenchi delle firme"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 msgid "show all notations during signature listings"
 msgstr "mostra tutte le notazioni durante gli elenchi delle firme"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr "mostra notazioni standard IETF durante gli elenchi delle firme"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "mostra le notazioni fornite dall'utente durante gli elenchi delle firme"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "mostra gli URL preferiti del keyserver durante gli elenchi delle firme"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr "mostra validità ID utente durante le inserzioni chiave"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr "mostra ID utente revocati e scaduti negli elenchi di chiavi"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr "mostra sottochiavi revocate e scadute negli elenchi di chiavi"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 msgid "show the keyring name in key listings"
 msgstr "mostrare il nome del keyring negli elenchi delle chiavi"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 msgid "show expiration dates during signature listings"
 msgstr "mostra date di scadenza durante le inserzioni delle firme"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "criterio TOFU sconosciuto '%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(utilizzare \"help\" per elencare le scelte)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Questo comando non è permesso in modalità %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Nota: %s non è per uso normale!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' non è una scadenza di firma valida\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" non è un indirizzo di posta elettronica corretto\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "modalità pinentry non valida '%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "origine richiesta non valida '%s'\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' non è un set di caratteri valido\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile analizzare l'URL del server dei chiavi\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni keyserver non valide\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "opzioni keyserver non valide\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opzione di filtro non valida: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di elenco non valide\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr "opzioni di elenco non valide\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr "visualizzare gli ID foto durante la verifica della firma"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr "mostra URL dei criteri durante la verifica della firma"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 msgid "show all notations during signature verification"
 msgstr "mostra tutte le notazioni durante la verifica della firma"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr "mostra notazioni standard IETF durante la verifica della firma"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 "mostra le notazioni fornite dall'utente durante la verifica della firma"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "mostra gli URL preferiti del keyserver durante la verifica della firma"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 msgid "show user ID validity during signature verification"
 msgstr "mostra validità DELL'ID utente durante la verifica della firma"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "mostra ID utente revocati e scaduti nella verifica della firma"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 msgid "show only the primary user ID in signature verification"
 msgstr "mostra solo l'ID utente primario nella verifica della firma"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di verifica non valide\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr "opzioni di verifica non valide\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: elenco di individuazione automatica della chiave non valido\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "elenco di individuazione automatica delle chiavi non valido\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "argomento non valido per l'opzione \"%.50s\"\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non è permesso usare %s con %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "AVVISO: in esecuzione con l'ora di sistema falso: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "non verrà eseguito con memoria non protetta a causa di %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non è valido\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, c-format
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "l'algoritmo AEAD selezionato non è valido\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritmo di compressione selezionato non valido\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non è valido\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve essere compreso tra 1 e 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Nota: la modalità S2K semplice (0) è fortemente sconsigliata\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, c-format
 msgid "invalid personal AEAD preferences\n"
 msgstr "preferenze AEAD personali non valide\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "dimensione del blocco non valida - utilizzando %d\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "L'algoritmo AEAD '%s' non può essere utilizzato %s modalità\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "l'algoritmo di compressione '%s' non può essere utilizzato in modalità %s\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
 "crittografia a chiave pubblica\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "crittografia simmetrica di '%s' non riuscita: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "non è possibile utilizzare --symmetric --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "non è possibile utilizzare --symmetric --encrypt in modalità %s\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "non è possibile utilizzare --symmetric --sign --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 "non è possibile utilizzare --symmetric --sign --encrypt in modalità %s\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "esportazione come chiave ssh non riuscita: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo hash non valido '%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "errore durante l'analisi della specifica della chiave '%s': %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 "'%s' non sembra essere un ID chiave, un'impronta digitale o un keygrip "
 "valido\n"
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 "AVVISO: nessun comando fornito.  Cercando di indovinare cosa vuoi dire ...\n"
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non è valido\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non è valido\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL del keyserver preferito specificato non è valido\n"
@@ -3415,7 +3427,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
@@ -4140,7 +4152,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
@@ -4313,8 +4325,8 @@ msgstr "Ho controllato questa chiave con molta attenzione.\n"
 msgid "Really sign? (y/N) "
 msgstr "Davvero firmare? (y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
@@ -4520,7 +4532,7 @@ msgstr ""
 "revocabili\n"
 "  (nrsign), o qualsiasi altra combinazione (ltsign, tnrsign, ecc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "La chiave è stata revocata."
 
@@ -4568,7 +4580,7 @@ msgstr "Rimuovere davvero questo ID utente? (y/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Spostare davvero la chiave primaria? (y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr "È necessario selezionare esattamente una chiave.\n"
 
@@ -4644,161 +4656,161 @@ msgstr "Salvare le modifiche? (y/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Uscire senza salvare? (y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non è cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "non può revocare l'ultimo ID utente valido.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "revoca dell'ID utente non riuscita: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "impostazione dell'ID utente primario non riuscita: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" non è un'impronta digitale\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" non è l'impronta digitale primaria\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "ID utente '%s' non valido: %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "No matching user IDs."
 msgstr "Nessun ID utente corrispondente."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "Nothing to sign.\n"
 msgstr "Niente da firmare.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Non firmato da te.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "revoca della firma della chiave non riuscita: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' non è un'ora di scadenza valida\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" non è un'impronta digitale corretta\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "sottochiave \"%s\" non trovata\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr "AEAD: "
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr "Server delle chiavi preferito: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 msgid "Notations: "
 msgstr "Notazioni: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "La seguente chiave è stata revocata su %s dalla chiave %s %s\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Questa chiave può essere revocata dalla chiave %s %s"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr "(sensibile)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "creato: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr "revocato: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr "scaduto: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "scadenza: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr "utilizzo: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr "scheda-no: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr "attendibilità: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr "validità: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Questa chiave è stata disabilitata"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4807,17 +4819,17 @@ msgstr ""
 "corretta\n"
 "finchè non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr "revocato"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "scaduto"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4827,17 +4839,17 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "AVVISO: la sottochiave di crittografia scade a breve.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Si consiglia di modificare anche la sua data di scadenza.\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4846,73 +4858,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non è possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "Tale ID utente esiste già in questa chiave!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, 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:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Non è stato cancellato nulla.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "non valido"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID utente \"%s\" compattato: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID utente \"%s\": già ridotto a icona\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID utente \"%s\": già pulito\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4922,218 +4936,218 @@ msgstr ""
 "            designato può causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non è possibile aggiungere un revocatore designato a una chiave in stile\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "impossibile nominare una chiave come revocatore designato di sè stessa\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "questa chiave è già stata designata come revocatore\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ATTENZIONE: la nomina di una chiave a revocatrice designata non può essere\n"
 "annullata.\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sei sicuro di voler nominare questa chiave come revocatore designato? (y/N) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr ""
 "Si è sicuri di voler modificare l'ora di scadenza per più sottochiavi? (y/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modifica dell'ora di scadenza per una sottochiave.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non è possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 msgid "Changing usage of a subkey.\n"
 msgstr "Modifica dell'utilizzo di una sottochiave.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 msgid "Changing usage of the primary key.\n"
 msgstr "Modifica dell'utilizzo della chiave primaria.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "la sottochiave di firma %s è già certificata incrociata\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "la sottochiave %s non firma e pertanto non deve essere certificata\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ignorare l'autode firma v3 sull'ID utente \"%s\"\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr "Immettere l'URL del server di chiavi preferito: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerlo sostituire? (y/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerlo eliminare? (y/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 msgid "Enter the notation: "
 msgstr "Immettere la notazione: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 msgid "Proceed? (y/N) "
 msgstr "Procedere? (y/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nessun ID utente con hash %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nessuna sottochiave con ID di chiave '%s'.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessuna sottochiave con indice %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utente: \"%s\"\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "firmato dalla chiave %s su %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave è scaduta il %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Sono stati firmati questi ID utente sulla chiave %s:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr " (non revocabile)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocato dalla chiave %s su %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "tentativo di revocare un ID non utente: %s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" è già stato revocato\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ATTENZIONE: una firma dell'user ID ha la data di %d secondi nel futuro\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Impossibile revocare l'ultimo ID utente valido.\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La chiave %s è già stata revocata.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sottochiave %s è già stata revocata.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5548,6 +5562,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Per favore non mettere l'indirizzo di email nel nome o nel commento\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Tale ID utente esiste già in questa chiave!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5871,7 +5889,7 @@ msgstr "protocollo keyserver non valido (noi %d!=intestazione %d!)\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" non è un ID chiave:\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5880,47 +5898,47 @@ msgstr[1] ""
 "aggiornamento della chiavi %d da %s\n"
 "\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVVISO: impossibile aggiornare la chiave %s tramite %s: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chiave \"%s\" non trovata nel keyserver\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "chiave non trovata nel keyserver\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "richiesta della chiave %s da %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "nessun keyserver noto\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "\"%s\" ignorato: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "invio della chiave %s a %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "richiesta di chiave da '%s'\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVVISO: impossibile recuperare l'URI %s: %s\n"
@@ -5950,69 +5968,69 @@ msgstr "crittografato con algoritmi sconosciuti %d.%s\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passphrase generata con algoritmo digest sconosciuto %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr "la chiave pubblica è %s\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "crittografato con %s chiave, ID %s, creato %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr ""
 "crittografata con chiave %s, ID %s\n"
 "\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "AVVISO: più testo in chiaro visti\n"
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifratto con %lu passphrase\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifratto con 1 passphrase\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suppongo che i dati siano cifrati con %s\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifrario IDEA non disponibile, ottimisticamente cerco di usare %s\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATTENZIONE: l'integrità del messaggio non era protetta\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -6022,179 +6040,179 @@ msgstr ""
 "probabile che questo messaggio sia legittimo.  Questo perché indietro\n"
 "quindi la protezione dell'integrità non è stata ampiamente utilizzata.\n"
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Utilizzare comunque l'opzione '%s' per decrittografare.\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "decrittazione costretto a fallire!\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato è stato manipolato!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Nota: mittente richiesto \"solo per i tuoi occhi\"\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, c-format
 msgid "no signature found\n"
 msgstr "nessuna firma trovata\n"
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma BAD da \"%s\""
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma scaduta da \"%s\""
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da \"%s\""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "impossibile gestire questi dati di firma ambigui\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firma effettuata %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               utilizzando la chiave %s %s\n"
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firma effettuata %s utilizzando l'ID chiave %s %s\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               autorità emittente \"%s\"\n"
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Chiave disponibile presso: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "Nota: utilizzare '%s' per utilizzare queste informazioni\n"
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                 aka \"%s\""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "AVVISO: questa chiave non è adatta per l'accesso in modalità %s\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Questa firma scadrà il %s\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "Firma %s, algoritmo digest %s%s%s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 msgid ", key algorithm "
 msgstr ", algoritmo a chiave "
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 "AVVISO: non è una firma disconnessa; il file '%s' NON è stato verificato!\n"
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "non è una firma separata\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "ATTENZIONE: trovate firme multiple. Sarà controllata solo la prima.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
@@ -6266,11 +6284,6 @@ msgstr "(ulteriori informazioni: "
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d \"%s\" è una opzione deprecata\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "ATTENZIONE: \"%s\" è una opzione deprecata\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7369,133 +7382,133 @@ msgstr "errore di lettura in '%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sync fallita: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "impossibile creare il blocco per '%s'\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "impossibile bloccare '%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek fallita: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrittura fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "transazione del trustdb troppo grande\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "impossibile accedere a '%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: creazione del record della versione fallita: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: è stato creato un trustdb non valido\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: creato il trustdb\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Nota: trustdb non scrivibile\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb non valido\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: creazione della tabella hash fallita: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: errore durante l'aggiornamento del record di versione: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: errore durante la lettura del record di versione: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: errore durante la scrittura del record di versione: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fallita: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: non è un file di trustdb\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: record di versione con recnum %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versione %d del file non valida\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: errore durante la scrittura del dir record: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: azzeramento di un record fallito: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: accodatura a un record fallita: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Errore: trustdb danneggiato.\n"
@@ -8132,16 +8145,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%sNumero: %s%%0ATitolare: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Tentativi rimanenti: %d"
@@ -8170,10 +8183,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Errore di richiamata PIN: %s\n"
@@ -8193,57 +8206,57 @@ msgstr "Il PIN è troppo lungo; la lunghezza massima è %d\n"
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr "Il PIN ha caratteri non validi; sono consentite solo cifre\n"
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr "chiave già esistente\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "chiave esistente verrà sostituita\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr "generazione di una nuova chiave\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, c-format
 msgid "writing new key\n"
 msgstr "genera una nuova coppia di chiavi\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "impossibile archiviare la chiave: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "risposta non contiene il modulo RSA\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "risposta non contiene l'esponente pubblico RSA\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "risposta non contiene la chiave pubblica CE\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "si prega di attendere mentre la chiave viene generata …\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr "generazione della chiave non riuscita\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8253,62 +8266,62 @@ msgstr[1] ""
 "\n"
 "\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "risposta non contiene i dati della chiave pubblica\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||Immettere il PIN per la chiave per creare firme qualificate."
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Inserisci il PIN di amministratore"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Inserisci il codice di sblocco del PIN (PUK) per i tasti standard."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Si prega di inserire il PIN per le chiavi standard."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Modulo RSA mancante o non di dimensione %d bit\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "Esponente pubblico RSA mancante o superiore a %d bit\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 msgid "Note: PIN has not yet been enabled."
 msgstr "Nota: il PIN non è ancora stato abilitato."
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "il NullPIN non è ancora stato modificato\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Immettere un nuovo PIN per le chiavi standard."
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|N|Inserisci un nuovo codice di sblocco del PIN (PUK) per i tasti standard."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|Immettere un nuovo PIN per la chiave per creare firme qualificate."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8316,7 +8329,7 @@ msgstr ""
 "|NP|Inserisci un nuovo codice di sblocco PIN (PUK) per la chiave per creare "
 "firme qualificate."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8324,27 +8337,27 @@ msgstr ""
 "|P|Inserisci il codice di sblocco del PIN (PUK) per la chiave per creare "
 "firme qualificate."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "errore durante il recupero del nuovo PIN: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "impossibile memorizzare l'impronta digitale: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "impossibile memorizzare la data di creazione: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "errore durante il recupero dello stato CHV dalla scheda\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "lettura della chiave pubblica non riuscita: %s\n"
@@ -8352,44 +8365,44 @@ msgstr "lettura della chiave pubblica non riuscita: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNumero: %s%%0AHolder: %s%%0ACounter: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "utilizzando il PIN predefinito come %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "impossibile utilizzare il PIN predefinito come %s: %s - disabilitazione "
 "dell'ulteriore utilizzo predefinito\n"
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 msgid "||Please unlock the card"
 msgstr "||Si prega di sbloccare la carta"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "Il PIN per CHV%d è troppo breve; la lunghezza minima è %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verifica CHV%d non riuscita: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "carta è bloccata in modo permanente!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8401,20 +8414,20 @@ msgstr[1] ""
 "%d tentativi di PIN di amministrazione rimanenti prima che la schede vengano "
 "bloccate in modo permanente\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "l'accesso ai comandi di amministrazione non è configurato\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 msgid "||Please enter the PIN"
 msgstr "||Inserisci il PIN"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Inserisci il Codice reset per la carta"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Il codice di reimpostazione è troppo breve; la lunghezza minima è %d\n"
@@ -8422,72 +8435,72 @@ msgstr "Il codice di reimpostazione è troppo breve; la lunghezza minima è %d\n
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nuovo codice di ripristino"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nuovo PIN di amministrazione"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr "|N|Nuovo PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Inserisci il PIN di amministratore e il nuovo PIN di amministrazione"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Inserisci il PIN e il nuovo PIN"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr "errore durante la lettura dei dati dell'applicazione\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "errore durante la lettura dell'impronta digitale DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "timestamp di creazione mancante\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA primo %s mancante o non di dimensione %d bit\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, c-format
 msgid "unsupported curve\n"
 msgstr "curva non supportata\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "struttura non valida della scheda OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "impronta digitale sulla carta non corrisponde a quello richiesto\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "scheda non supporta l'algoritmo digest %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "firme create finora: %lu\n"
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8495,7 +8508,7 @@ msgstr ""
 "la verifica del PIN di amministrazione è attualmente vietata tramite questo "
 "comando\n"
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossibile accedere a %s - scheda OpenPGP non valida?\n"
@@ -8515,7 +8528,7 @@ msgstr "|N|Nuovo PIN iniziale"
 msgid "run in multi server mode (foreground)"
 msgstr "eseguire in modalità multi server (in primo piano)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL| impostare il livello di debug su LEVEL"
 
@@ -8559,11 +8572,11 @@ msgstr "|LIST| la priorità dell'applicazione in LIST"
 msgid "deny the use of admin card commands"
 msgstr "negare l'uso dei comandi della scheda di amministrazione"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Utilizzo: @SCDAEMON@ [opzioni] (-h per assistenza)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8571,24 +8584,24 @@ msgstr ""
 "Sintassi: scdaemon [opzioni] [comando [args]]\n"
 "Daemon smartcard per @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "si prega di utilizzare l'opzione '--daemon' per eseguire il programma in "
 "background\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "gestore per fd %d avviato\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "gestore per fd %d terminato\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -8819,7 +8832,7 @@ msgstr "certificato radice non contrassegnato come attendibile"
 msgid "checking the trust list failed: %s\n"
 msgstr "controllo dell'elenco di attendibilità non riuscito: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "catena di certificati troppo lunga\n"
@@ -8874,7 +8887,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "un hash di bit %u non è valido per una chiave %u bit %s\n"
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
@@ -8920,46 +8933,46 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "creato %s, scade %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 "nessun utilizzo chiave specificato - supponendo che tutti gli utilizzi\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 "certificato non avrebbe dovuto essere utilizzato per la certificazione\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 "certificato non deve essere stato utilizzato per la firma della risposta "
 "OCSP\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certificato non avrebbe dovuto essere utilizzato per la crittografia\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certificato non avrebbe dovuto essere utilizzato per la firma\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certificato non è utilizzabile per la crittografia\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certificato non è utilizzabile per la firma\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "alla ricerca di un altro certificato\n"
@@ -9154,6 +9167,11 @@ msgstr "Creare un certificato autofirmato? (y/N) "
 msgid "These parameters are used:\n"
 msgstr "Vengono utilizzati i seguenti parametri:\n"
 
+#: sm/certreqgen-ui.c:433
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "errore durante la creazione del file temporaneo: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr "Creazione di un certificato autofirmato.  "
@@ -9224,123 +9242,123 @@ msgstr "eliminazione del certificato \"%s\" non riuscita: %s\n"
 msgid "no valid recipients given\n"
 msgstr "nessun destinatario valido dato\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "list external keys"
 msgstr "elencare le chiavi esterne"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "list certificate chain"
 msgstr "catena di certificati valida"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 msgid "import certificates"
 msgstr "importa certificati"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "export certificates"
 msgstr "esporta certificati"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr "registrare una smart card"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr "passare un comando al dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr "richiamare gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr "|N|numero di certificati da includere"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|prendere le informazioni sui criteri da FILE"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr "presupporre che l'input sia in formato PEM"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr "presupporre che l'input sia in formato base 64"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr "presupporre che l'input sia in formato binario"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 msgid "create base-64 encoded output"
 msgstr "creare output codificato in base 64"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|utilizzare USER-ID come chiave segreta predefinita"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|aggiungere il tasto all'elenco dei keyring"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr "recupera i certificati degli emittenti mancanti"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "Nome: utilizzare il nome di codifica per le passphrase PKCS-12"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr "non consultare mai una CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr "non controllare i certificati radice nei CRL"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr "verificare la validità utilizzando OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr "non controllare le politiche dei certificati"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|usa l'algoritmo di cifratura NAME"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|usa l'algoritmo di message digest NAME"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "risponde \"sì\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "risponde \"no\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|scrittura di un registro di controllo in FILE"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Utilizzo: @GPGSM@ [opzioni] [file] (-h per assistenza)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9351,27 +9369,27 @@ msgstr ""
 "protocollo S/MIME\n"
 "Il funzionamento predefinito dipende dai dati di input\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Nota: impossibile eseguire la crittografia in '%s': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "modello di convalida sconosciuto '%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importazione di certificati comuni '%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "impossibile firmare utilizzando '%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "comando non valido (non esiste alcun comando implicito)\n"
@@ -9401,7 +9419,7 @@ msgstr "errore durante il recupero dei flag memorizzati: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "errore durante l'importazione del certificato: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "errore durante la lettura dell'input: %s\n"
@@ -9441,7 +9459,7 @@ msgstr "problema durante la ri-ricerca del certificato: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "errore durante l'archiviazione dei flag: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Errore - "
 
@@ -9820,11 +9838,6 @@ msgstr "impossibile creare il file dir della cache temporanea '%s': %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "errore durante la chiusura di '%s': %s\n"
 
-#: dirmngr/crlcache.c:948
-#, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "errore durante la ridenominazione di '%s' in '%s': %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
@@ -10523,93 +10536,93 @@ msgstr "i livelli di debug validi sono: %s\n"
 msgid "usage: %s [options] "
 msgstr "utilizzo: %s [opzioni] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "due punti non sono consentiti nel nome del socket\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "recupero CRL da '%s' non riuscito: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "elaborazione CRL da '%s' non riuscita: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: riga troppo lunga - ignorata\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: rilevata impronta digitale non valida\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s: %u: errore di lettura: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s: %u: Garbage alla fine della riga ignorato\n"
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 "SIGHUP ricevuto - rilezione delle cache di configurazione e svuotamento\n"
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 ricevuto - nessuna azione definita\n"
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM ricevuto - arresto …\n"
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM ricevuto - connessioni ancora %d attive\n"
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, c-format
 msgid "shutdown forced\n"
 msgstr "arresto forzato\n"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT ricevuto - arresto immediato\n"
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "segnale %d ricevuto - nessuna azione definita\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "errore durante l'accesso a '%s': stato http %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL '%s' reindirizzato a '%s' (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "troppi reindirizzamenti\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "reindirizzamento modificato in '%s'\n"
@@ -10976,55 +10989,55 @@ msgstr "catena di certificati è buono\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certificato non deve essere stato utilizzato per la firma CRL\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "tranquilla"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr "stampare i dati esendo codificati"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr "decodificare le righe di dati ricevute"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr "collegare al dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "connect to the keyboxd"
 msgstr "connettersi alla cassetta delle chiavi"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|connessione al socket Assuan NOME"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|connessione al server Assuan presso ADDR"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr "eseguire il server Assuan specificato sulla riga di comando"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr "non utilizzare la modalità di connessione estesa"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|esegui comandi da FILE all'avvio"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr "eseguire /subst all'avvio"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Utilizzo: @GPG@-connect-agent [opzioni] (-h per assistenza)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -11032,48 +11045,48 @@ msgstr ""
 "Sintassi: @GPG@-connect-agent [opzioni]\n"
 "Connettersi a un agente in esecuzione e inviare comandi\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "l'opzione \"%s\" richiede un programma e argomenti facoltativi\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "opzione \"%s\" ignorata a causa di \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "linea di ricezione non riuscita: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "linea troppo lunga - saltata\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "linea accorciata a causa del carattere Nul incorporato\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "comando sconosciuto '%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "riga di invio non riuscita: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "nessun daemon keybox in esecuzione in questa sessione\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "errore durante l'invio delle opzioni standard: %s\n"
@@ -11133,12 +11146,12 @@ msgstr "Verifica esterna del componente %s non riuscita"
 msgid "Note that group specifications are ignored\n"
 msgstr "Si noti che le specifiche del gruppo vengono ignorate\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "errore durante la chiusura di '%s'\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "errore durante l'analisi di '%s'\n"
@@ -11322,6 +11335,12 @@ msgstr "Comandi di gestione Yubikey"
 msgid "manage the command history"
 msgstr "gestire la cronologia dei comandi"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "errore durante la scrittura nel file temporaneo: %s\n"
+
+#~ msgid "run in supervised mode"
+#~ msgstr "eseguire in modalità supervisionata"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Il nome non può iniziare con una cifra\n"
 
@@ -11638,9 +11657,6 @@ msgstr "gestire la cronologia dei comandi"
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "impossibile aprire %s per la scrittura: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "errore durante la scrittura in %s: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "errore durante la chiusura di %s: %s\n"
 
diff --git a/po/ja.gmo b/po/ja.gmo
index f68e958..d4e30f9 100644
--- a/po/ja.gmo
+++ b/po/ja.gmo
diff --git a/po/ja.po b/po/ja.po
index e9489e9..2d9c4ff 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.3.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-21 16:55+0200\n"
-"PO-Revision-Date: 2021-04-08 10:15+0900\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
+"PO-Revision-Date: 2022-04-25 15:44+0200\n"
 "Last-Translator: NIIBE Yutaka <gniibe@fsij.org>\n"
 "Language-Team: none\n"
 "Language: ja\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "pinentry�ロック��得�失敗����: %s\n"
@@ -32,49 +32,49 @@ msgstr "pinentry�ロック��得�失敗����: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|キャンセル(_C)"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Yes"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_No"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|パスワードマ�ージャ��管(_S)"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "本当�画��パスフレーズを見�るよ������?"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|パスフレーズを見�るよ���る"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|パスフレーズを隠�"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr "キャプスロック�オン��"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr "�示�る"
 
@@ -85,27 +85,27 @@ msgstr "�示�る"
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr "ランダム�パスフレーズを�示�る"
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr "注�: ブランク�パスフレーズ�一部���り��ん。"
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 msgid "Passphrase Not Allowed"
 msgstr "パスフレーズ���られ��ん"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "�質:"
 
@@ -115,11 +115,11 @@ msgstr "�質:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -127,7 +127,7 @@ msgstr ""
 "����PINを入力������(��セッション�秘密��ロックを解除�る���"
 "使�れ��)"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -135,76 +135,76 @@ msgstr ""
 "����パスフレーズを入力������(��セッション�秘密��ロックを解除�"
 "る���使�れ��)"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "パスフレーズ:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "一致���ん - も�一度"
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (�在 %d / 最大 %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr "繰り返�:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 msgid "PIN too long"
 msgstr "PIN�長����"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 msgid "Passphrase too long"
 msgstr "パスフレーズ�長����"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 msgid "Invalid characters in PIN"
 msgstr "PIN�無効�文字��り��"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr "PIN�短����"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad PIN"
 msgstr "�正�PIN��"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad Passphrase"
 msgstr "パスフレーズ��正��"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr "注�: ウェブブラウザ�ら�リクエスト��。"
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr "注�: リモートサイト�ら�リクエスト��。"
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "��パスフレーズをも�一度入力������"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
@@ -213,7 +213,7 @@ msgstr ""
 "%sシステム�イン�ート�れ�オブジェクトを�護�る���パスフレーズを入力�"
 "�����"
 
-#: agent/command.c:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -227,24 +227,24 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh��%dビットより大��も��サ�ート�れ��ん\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, 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
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, 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:2513
+#: agent/command-ssh.c:2467
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "カード�リスト ��得エラー: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, 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:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr "許��る"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr "拒��る"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "以下�ssh��対�るパスフレーズを入力������:%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -290,88 +290,80 @@ msgstr ""
 "パスフレーズを入力������。gpg-agent����管��信��秘密�%%0A   %s"
 "%%0A   %s%%0Aを�護���。"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "ソケット�らストリームを作��る��失敗����: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "以下�シリアル番��カードを挿入������"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "管�者PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "リセット・コード"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr "カード/トークン�ACKボタンを押������。"
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr "リーダー�ピンパッドを入力�使������。"
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "��リセット・コードをも�一度入力������"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "��PUKをも�一度入力������"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "��PINをも�一度入力������"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "リセット・コード�正��繰り返�れ����ん。も�一度"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK�正��繰り返�れ����ん。も�一度"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN�正��繰り返�れ����ん。も�一度"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "カード�ロックを解除�る���PIN%s%s%sを入力������"
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "一時ファイル�作�エラー: %s\n"
-
-#: agent/genkey.c:150
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "一時ファイル�書�込�エラー: %s\n"
+#: agent/genkey.c:154
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "'%s'�書�込�エラー: %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 msgid "Enter new passphrase"
 msgstr "新��パスフレーズを入力������"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 "パスフレーズ�入力�れ��ん���!%0A空�パスフレーズ���られ��ん。"
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -380,251 +372,247 @@ msgstr ""
 "パスフレーズ�入力�れ��ん��� - 通常�れ�良���考���!%0A��何��"
 "護も必�������を確�����。"
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr "����護�必��り��ん"
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "パスフレーズ�最低�も%u文字以上���れ��り��ん。"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
 "A passphrase should contain at least %u digits or%%0Aspecial characters."
 msgstr[0] "パスフレーズ�最低�も%u文字�数字�特殊文字を�む����。"
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "パスフレーズ���よ�知られ��る用語や特定�パターン�マッ��るも��%%0A"
 "����ょ�。"
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "警告: 安全��言���パスフレーズ�入力�れ���。"
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 msgid "Take this one anyway"
 msgstr "�れ�も�れを使���"
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "新���を�護�る����%0Aパスフレーズを入力������。"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 msgid "Please enter the new passphrase"
 msgstr "新��パスフレーズを入力������"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 msgid "Options used for startup"
 msgstr "起動�使�れるオプション"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr "デーモン・モード�実行 (�ックグラウンド)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr "サー�・モード�実行 (フォアグラウンド)"
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-msgid "run in supervised mode"
-msgstr "スーパー�イズド・モード�実行"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr "コンソール�らデタッ����"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr "sh-形��コマンド出力"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr "csh-形��コマンド出力"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|FILE�らオプションを読�込���"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr "診断出力を制御�るオプション"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "冗長"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "��ら������"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|FILE�サー�・モード�ログを書�出�"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr "コンフィグレーションを制御�るオプション"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "SCdaemonを使���"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|PGMをSCdaemonプログラム���使�"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|PGMをtpm2daemonプログラム���使�"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|NAME�ら�コマンドを��付�る"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "TTY�変更�求を無視�る"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "Xディスプレイ�変更�求を無視�る"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "sshサ�ートを有功��る"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|ssh署��表示�ALGOを使�"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "puttyサ�ートを有功��る"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "セキュリティを制御�るオプション"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|N秒後�����PINを無効��る"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|N秒後�SSH�を無効��る"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|最大PINキャッシュ存続時間をN秒��る"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|最大SSH�存続時間をN秒��る"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr "署��対��PIN���を使���"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 msgid "disallow the use of an external password cache"
 msgstr "外部�パスワードキャッシュ�使用を����"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "クライアント���\"trusted\"マークを��る��を����"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 msgid "allow presetting passphrase"
 msgstr "パスフレーズ�事�設定を��る"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr "パスワード・�リシー�強制オプション"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr "パスワード・�リシーを迂回�る��を����"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|新��パスフレーズ�必���る最低長をN��る"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 "|N|新��パスフレーズ���アルファベット���キャラクタを最低N必���る"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|新��パスフレーズをFILE�パターン�対���ェック�る"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|N日後�パスフレーズを期�切れ��る"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 msgid "do not allow the reuse of old passphrases"
 msgstr "��パスフレーズを�使用�る��を����"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "Options controlling the PIN-Entry"
 msgstr "PIN-Entryを制御�るオプション"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 msgid "never use the PIN-entry"
 msgstr "PIN-Entryを決��使���"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr "pinentryより優先��パスフレーズ入力を����"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "PIN-Entry�キーボード�マウスを�有��る"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|PGMをPIN入力プログラム���使�"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|Pinentry�タイムアウトをN秒��る"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "Emacsを通��パスフレーズを催促�る��を��る"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "�グ� <@EMAIL@> ���報告����。\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "使�方: @GPG_AGENT@ [オプション] (ヘルプ� -h)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -632,131 +620,136 @@ msgstr ""
 "形�: @GPG_AGENT@ [オプション] [コマンド [引数]]\n"
 "@GnuPG@�秘密��管�\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "無効�debug-level '%s'�与�られ���\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "�択�れ�ダイジェスト・アルゴリズム��無効��\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "'%s' �らオプションを読�込���\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "注�: '%s'�オプション��考�られ��ん\n"
 
-#: agent/gpg-agent.c:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "*警告*: \"%s\"��廃止�れ�オプション��\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "ソケット�作�����ん: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "ソケット�'%s'�長����\n"
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "稼�中� %s �らソケットを奪������\n"
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent�既�実行�れ���� - 新��も�をスタート����ん\n"
 
-#: agent/gpg-agent.c:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "ソケット�ナンス�得エラー\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "'%s'�ソケット��インド�エラー: %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "'%s'�許��設定����ん: %s\n"
 
-#: agent/gpg-agent.c:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "ソケット'%s'�listen\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "ディレクトリ'%s'�作�����ん: %s\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "ディレクトリ'%s'�作��れ���\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "'%s'�stat()�失敗����: %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "'%s'をホーム・ディレクトリ�使���ん\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fd %d�ナンス�読�込�エラー: %s\n"
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "�ンドラ0x%lx (fd %d �対�る)�開始\n"
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "�ンドラ0x%lx (fd %d �対�る)�終了\n"
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh �ンドラ0x%lx (fd %d �対�る)�開始\n"
 
-#: agent/gpg-agent.c:2832
+#: agent/gpg-agent.c:2842
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh �ンドラ0x%lx (fd %d �対�る)�終了\n"
 
-#: agent/gpg-agent.c:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect�失敗����: %s - 一秒待���\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s �止����\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "��セッション�gpg-agent�実行�れ����ん\n"
@@ -781,7 +774,7 @@ msgstr ""
 "形�: gpg-preset-passphrase [オプション] KEYGRIP\n"
 "パスワードキャッシュ�管�\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -791,7 +784,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -848,42 +841,42 @@ msgstr "キャンセル�れ���\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "パスフレーズを������る際�エラー: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "'%s'を開�際�エラー: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "ファイル'%s'(行 %d): %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "ステートメント \"%s\" �'%s'�無視�れ���(行 %d)\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "システム信用リスト'%s'�得られ��ん\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "'%s'��正�フィンガープリント (行 %d)\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "'%s'�無効��フラグ(行 %d)\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "'%s'�読�込�エラー(行 %d): %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "信用�れ�ルート証明書�リスト�読�込�エラ−\n"
@@ -896,18 +889,18 @@ msgstr "信用�れ�ルート証明書�リスト�読�込�エラ−\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr "究極的��れを信用�%%0A  \"%s\"%%0A正�ユーザ�証明書��証����?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 msgid "Yes"
 msgstr "��"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr "���"
@@ -920,7 +913,7 @@ msgstr "���"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -932,20 +925,25 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr "正��"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr "誤り"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "'%s'�ら'%s'���変更�エラー: %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "注�: パスフレーズ�変更�れ����ん。%0A今�変更������。"
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -954,26 +952,40 @@ msgstr ""
 "��パスフレーズ�%.4s-%.2s-%.2s�ら変更�れ����ん。%%0A今�変更����"
 "��。"
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 msgid "Change passphrase"
 msgstr "パスフレーズを変更�る"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr "後�変更�る"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+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?"
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+"sshプロセス�以下���使用を�求����:%%0A  %s%%0A  (%s)%%0A��使用を�"
+"����?"
+
+#: agent/findkey.c:1741
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "本当����: keygrip%%0A  %s%%0A  %%C%%0Aを削除����?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 msgid "Delete key"
 msgstr "�を削除�る"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -997,7 +1009,7 @@ msgstr "%s é�µã�¯å®‰å…¨ã�§ã�ªã�„(%uビット)ãƒ�ッシュを使用ã�—ã�¦ã�„ã�¾ã�
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%zuビット��ッシュ�%uビット�%s���無効��\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "作��れ�署��検査�失敗����: %s\n"
@@ -1036,7 +1048,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "プロセスforkエラー: %s\n"
@@ -1097,12 +1109,12 @@ msgstr "警告: '%s'�安全���所有 \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告: '%s'�安全���許� \"%s\"\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:880
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "ファイル'%s'�アクセス��る�を待���...\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "'%s'�ら'%s'���変更�失敗: %s\n"
@@ -1319,7 +1331,7 @@ msgid "algorithm: %s"
 msgstr "アルゴリズム: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "サ�ート�れ����アルゴリズム: %s"
@@ -1474,7 +1486,7 @@ msgstr "'%s'�ら'%s'��変��利用����ん\n"
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open�失敗����: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "'%s'�ら'%s'��変��失敗: %s\n"
@@ -1513,7 +1525,7 @@ msgstr "lock '%s' �作��れ��ん���: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "lock %s を待���...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s ������ (%s �必���在 %s)\n"
@@ -1680,7 +1692,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "��セッション�dirmngr�実行�れ����ん\n"
@@ -1720,7 +1732,7 @@ msgstr "サーãƒ�ã�‹ã‚‰ã�®å�—ã�‘容れるã�“ã�¨ã�®ã�§ã��ã�ªã�„HTTPりダイレã‚
 msgid "server uses an invalid certificate"
 msgstr "サー��無効�証明書を使�����"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, c-format
 msgid "Note: %s\n"
 msgstr "注�: %s\n"
@@ -1747,7 +1759,7 @@ msgstr "�れ��ッ�・モード������ん\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "��コマンド�使�る���ージョン2�カード����\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "リセット・コード�(も�や)利用�能���り��ん\n"
@@ -1812,14 +1824,14 @@ msgstr "公開�を�得�るURL: "
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "'%s'�読�込�エラー: %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
@@ -2147,26 +2159,26 @@ msgstr "管�者コマンド��止�れ����\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無効�コマンド (\"help\"を�照)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "��コマンド�--output�機能���ん\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "'%s'�開���ん\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�\"%s\"�見��り��ん: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2225,8 +2237,8 @@ msgid "subkey"
 msgstr "副�: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新�失敗����: %s\n"
@@ -2286,14 +2298,14 @@ msgstr "æš—å�·ã‚¢ãƒ«ã‚´ãƒªã‚ºãƒ '%s'ã‚’æš—å�·åŒ–ã�«ä½¿ã�†ã�“ã�¨ã�¯ã�§ã��ã�¾ã�›ã‚
 msgid "(use option \"%s\" to override)\n"
 msgstr "(オー�ーライド�る���オプション\"%s\"を使���)\n"
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "暗�アルゴリズム'%s'を%sモード�使��������ん\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2315,7 +2327,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "*警告*: �%s��%sモード���暗�化�����ん\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2345,10 +2357,9 @@ 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
@@ -2415,12 +2426,12 @@ msgstr "秘密��エクス�ート���られ��ん\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "�%s: PGP 2.x形����� - スキップ���\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "*警告*: 何もエクス�ート�れ����ん\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, c-format
 msgid "error creating '%s': %s\n"
@@ -2484,268 +2495,268 @@ msgstr "--allow-non-selfsigned-uid�有効��れ�無効��%s��\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "副�%s(主�%s����)を用���\n"
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "オプション'%s'�有効�値:\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 msgid "make a signature"
 msgstr "署�を作�"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "make a clear text signature"
 msgstr "クリア・テクスト署�を作�"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "分�署�を作�"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "データを暗�化"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "暗�化��共通�暗�方���を使用"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "データを復� (デフォルト)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "署�を検証"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "��一覧"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "��署��一覧"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr "�署��検査�一覧"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "��フィンガープリント�一覧"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "秘密��一覧"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "新���ペアを生�"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 msgid "quickly generate a new key pair"
 msgstr "��や�新���ペアを生�"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "quickly add a new user-id"
 msgstr "��や�新��ユーザIDを追加"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 msgid "quickly revoke a user-id"
 msgstr "��や�ユーザIDを失効"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly set a new expiration date"
 msgstr "��や�新��有効期�を設定"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr "全機能��ペアを生�"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "失効証明書を生�"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "公開�リング�ら�を削除"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "秘密�リング�ら�を削除"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "quickly sign a key"
 msgstr "��や���署�"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "quickly sign a key locally"
 msgstr "��や���ローカル�署�"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 msgid "quickly revoke a key signature"
 msgstr "��や����署�を失効"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "��署�"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "��ローカル�署�"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "���署�や編集"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "パスフレーズ�変更"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "�をエクス�ート�る"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "�サー���をエクス�ート�る"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "�サー��ら�をイン�ート�る"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "�サー���を検索�る"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "�サー��ら�を全部更新�る"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "��イン�ート/マージ"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr "カード・ステイタスを表示"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr "カード�データを変更"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr "カード�PINを変更"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "信用データベースを更新"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid "print message digests"
 msgstr "メッセージ・ダイジェストを表示"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "サー�・モード�実行"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|TOFU�リシーを��設定�る"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|デフォルト�秘密����NAMEを用�る"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|ユーザID NAME�も暗�化�る"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|電�メールエイリアスを設定�る"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr "厳密�OpenPGP�振舞を採用"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "無変更"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "上書���確�"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr "入力を制御�るオプション"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr "出力を制御�るオプション"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "ASCII形��外装を作�"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|出力をFILE�書�出�"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "正準テキスト・モードを使用"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|圧縮レベルをN�設定 (0��圧縮)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr "��イン�ート�エクス�ートを制御�るオプション"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|メールアドレス�よ���を特定�る際�MECHANISMSを使用�る"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 msgid "import missing key from a signature"
 msgstr "署��ら手元����をイン�ート�る"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 msgid "include the public key in signatures"
 msgstr "署��公開�を��る"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "dirmngr������アクセスを無効��る"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr "��リスティングをを制御�るオプション"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 msgid "Options to specify keys"
 msgstr "�を指定�るオプション"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|USER-ID用�暗�化"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|署�や復����USER-IDを使用"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr "無人使用����オプション"
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr "�����オプション"
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2753,7 +2764,7 @@ msgstr ""
 "@\n"
 "(コマンド�オプション全部�一覧��マニュアル・ページを�覧����)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2773,11 +2784,11 @@ msgstr ""
 " --list-keys [��]         �を表示\n"
 " --fingerprint [��]       フィンガープリントを表示\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "使�方: @GPG@ [オプション] [ファイル] (ヘルプ� -h)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2787,7 +2798,7 @@ msgstr ""
 "署��検査�暗�化���復�\n"
 "デフォルト��作��入力データ��存\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2795,558 +2806,558 @@ msgstr ""
 "\n"
 "サ�ート���るアルゴリズム:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "公開�: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "暗�方�: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "�ッシュ: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "圧縮: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "使�方: %s [オプション] %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "対立�るコマンド\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "=記���グループ定義'%s'内�見��り��ん\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'�安全���所有\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "*警告*: コンフィグレーション・ファイル'%s'�安全���所有\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'�安全���所有\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'�安全���許�\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "*警告*: コンフィグレーション・ファイル'%s'�安全���許�\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'�安全���許�\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'�安全���上�ディレクトリ所有\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "*警告*: コンフィグレーション・ファイル'%s'�安全���上�ディレクトリ所有\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'�安全���上�ディレクトリ所有\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "*警告*: homedir '%s'�安全���上�ディレクトリ許�\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr ""
 "*警告*: コンフィグレーション・ファイル'%s'�安全���上�ディレクトリ許�\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "*警告*: 拡張'%s'�安全���上�ディレクトリ許�\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "�明�コンフィグレーション項目'%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr "��一覧時�フォトIDを表示�る"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 msgid "show key usage information during key listings"
 msgstr "��一覧時���使�方�情報を表示�る"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr "署��一覧時��リシーURLを表示�る"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 msgid "show all notations during signature listings"
 msgstr "署��一覧時�����注釈を表示�る"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr "署��一覧時�IETF標準注釈を表示�る"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr "署��一覧時�ユーザ�注釈を表示�る"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "署��一覧時�優先�サー�URLを表示�る"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr "��一覧時�ユーザID�有効性を表示�る"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr "��一覧�失効��ユーザID�期�切れ����ユーザIDを表示�る"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr "��一覧�失効��副��期�切れ����副�を表示�る"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 msgid "show the keyring name in key listings"
 msgstr "��一覧��リング���を表示�る"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 msgid "show expiration dates during signature listings"
 msgstr "署��一覧時�有効期��日付を表示�る"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "�明�TOFU�リシー'%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(�択肢�一覧��\"help\"を使������)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%sモード���コマンド��止��。\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "注�: 普通%s�使���ん!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s'��有効�署�表����り��ん\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\"�正��メール・アドレス���り��ん\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "無効� pinentry mode '%s'��\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "無効��信元�求 '%s' ��\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s'��有効�文字集����り��ん\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "�サー��URLを解��能\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無効��サー�・オプション��\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "無効��サー�・オプション��\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無効�イン�ート・オプション��\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "無効�イン�ート・オプション��\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "無効�フィルタ・オプション��: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無効�エクス�ート・オプション��\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "無効�エクス�ート・オプション��\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無効�一覧オプション��\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr "無効�一覧オプション��\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr "署��検証時�フォトIDを表示�る"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr "署��検証時��リシーURLを表示�る"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 msgid "show all notations during signature verification"
 msgstr "署��検証時�����注釈を表示�る"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr "署��検証時�IETF標準注釈を表示�る"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr "署��検証時�ユーザ�注釈を表示�る"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "署��検証時�優先�サー�URLを表示�る"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 msgid "show user ID validity during signature verification"
 msgstr "署��検証時�ユーザID�有効性を表示�る"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "署��検証時�失効��ユーザID�期�切れ����ユーザIDを表示�る"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 msgid "show only the primary user ID in signature verification"
 msgstr "署��検証時�プライマリ・ユーザID��をを表示�る"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無効�検証オプション��\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr "無効�検証オプション��\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-pathを%s�設定�能\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無効� auto-key-locate リスト��\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "無効� auto-key-locate リスト��\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "オプション\"%.50s\"��無効�引数��\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "*警告*: プログラム�coreファイルを作��る����り��!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "*警告*: %s�%sより優先\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s�%s��も�使��������ん!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s�%s��も�使��も無�味��!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "*警告*: ニセモノ�システム時刻�実行�����: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s ����セキュア���メモリ�実行���ん\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "�択�れ�暗�アルゴリズム�無効��\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, c-format
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "�択�れ�AEADアルゴリズム�無効��\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "�択�れ�圧縮アルゴリズム�無効��\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "�択�れ�証明書ダイジェスト・アルゴリズム�無効��\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�正�値�必���\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed�1より大��値�必���\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth�1�ら255�範囲���れ��り��ん\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "無効�default-cert-level。0�1�2�3���れ��り��ん\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無効�min-cert-level。0�1�2�3���れ��り��ん\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注�: �純�S2Kモード(0)�使用��強��対���\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無効�S2Kモード。0�1�3���れ��り��ん\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "無効�デフォルト�優先指定\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "無効�個人用暗�方��優先指定\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, c-format
 msgid "invalid personal AEAD preferences\n"
 msgstr "無効�個人用AEAD方��優先指定\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "無効�個人用ダイジェスト�優先指定\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "無効�個人用圧縮�優先指定\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "無効��ャンク長 - %dビット����\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s�%s����機能���ん\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "AEADアルゴリズム'%s'を%sモード�使��������ん\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "圧縮アルゴリズム'%s'を%sモード�使��������ん\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信用データベース��期化�失敗����: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "*警告*: 公開�暗�を使������人 (-r) を指定�����\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "'%s'�共通�暗��失敗����: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encryptを--s2k-mode 0�使��������ん\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "--symmetric --encryptを%sモード�使��������ん\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encryptを--s2k-mode 0�使��������ん\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "--symmetric --sign --encryptを%sモード�使��������ん\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�サー����信�失敗����: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�サー��ら��信�失敗����: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "��エクス�ート�失敗����: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "ssh�����エクス�ート�失敗����: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�サー��検索�失敗����: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�サー��更新�失敗����: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "外装除去�失敗����: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "外装�失敗����: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "無効��ッシュ・アルゴリズム'%s'��\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "�指定'%s'�構文解�エラー: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "'%s'�有効��ID, フィンガープリント�keygrip����よ���。\n"
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 "*警告*: コマンド�指定�れ����ん。��を�味���る��当����"
 "� ...\n"
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "開始���。メッセージを打������ ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "���られ�証明書�リシーURL�無効��\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "���られ�署��リシーURL�無効��\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "指定�れ�優先�サー�URL�無効��\n"
@@ -3359,7 +3370,7 @@ msgstr "|FILE|�リングFILE��を扱���"
 msgid "make timestamp conflicts only a warning"
 msgstr "日時�矛盾を警告������"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|��FD�ステイタス情報を書�出�"
 
@@ -4062,7 +4073,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�れ�も����署�������? (y/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  署��能。\n"
 
@@ -4234,8 +4245,8 @@ msgstr "�������り注���検査����。\n"
 msgid "Really sign? (y/N) "
 msgstr "本当�署�����? (y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "署��失敗����: %s\n"
@@ -4430,7 +4441,7 @@ msgstr ""
 "  't' �始�る�信用署� (tsign)�'nr' �始�る�失効��署�\n"
 "  (nrsign)�も����れら�組���� (ltsign, tnrsign, ��)��り��。\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "���失効�れ����。"
 
@@ -4478,7 +4489,7 @@ msgstr "��ユーザIDを本当�削除����? (y/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "��主�を本当�移動����? (y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr "�を���り1��択������。\n"
 
@@ -4553,161 +4564,161 @@ msgstr "変更を�存����? (y/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "�存���終了����? (y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "��無変更���更新�����。\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "最後�有効�ユーザID�失効����ん。\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "ユーザID�失効�失敗����: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "プライマリ・ユーザID�設定�失敗����: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\"�フィンガープリント���り��ん\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" �プライマリ・フィンガープリント���り��ん\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "無効�ユーザID '%s': %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "No matching user IDs."
 msgstr "マッ��るユーザID��り��ん。"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "Nothing to sign.\n"
 msgstr "署��るも���り��ん。\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "����よ��署��れ����ん。\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "��署��失効�失敗����: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s'��有効�有効期����り��ん\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\"�正��フィンガープリント���り��ん\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "副�\"%s\"�見��り��ん\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr "AEAD: "
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "ダイジェスト: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "機能: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr "�サー� 修正���"
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr "優先�サー�: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 msgid "Notations: "
 msgstr "注釈: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x形�ユーザID�優先指定���り��ん。\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "%s�%s�%s�よ��以下����失効�れ���\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "�����%s�%s�よ��失効�能��"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr "(機密指定)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "作�: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr "失効: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr "期�切れ: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "有効期�: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr "利用法: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr "カード番�: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr "信用: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr "有効性: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "����使用�止�設定�れ����"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4715,17 +4726,17 @@ msgstr ""
 "プログラムを�起動�る���表示�れ���有効性�正�����も�れ���\n"
 "�����を念頭��������。\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr "失効"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "期�切れ"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4734,17 +4745,17 @@ msgstr ""
 "*警告*: 主�るユーザID��り��ん。��コマンド��別�\n"
 "              ユーザID�主��る�仮定�る場���り��。\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "*警告*: ����暗�副��も���期�切れ��り��。\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "��有効期�も変更�����ょ�\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4754,70 +4765,70 @@ msgstr ""
 "��\n"
 "        ���を拒��る�も�れ��ん。\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�れ�も追加������? (y/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2形�����フォトIDを追加����ん。\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
-msgstr "�����ユーザID��������存在�����!\n"
+#: g10/keyedit.c:4329
+msgid "Such a user ID already exists on this key!"
+msgstr "�����ユーザID��������存在�����!"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "��正��署�を削除����? (y/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "��無効�署�を削除����? (y/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "���明�署�を削除����? (y/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "��自己署�を本当�削除����? (y/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d個�署�を削除����。\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "何も削除�����ん。\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "無効"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ユーザID \"%s\" ��コンパクト��り���: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ユーザID \"%s\": 既�最�化�れ����\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ユーザID \"%s\": 既�クリーン�������\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4827,209 +4838,209 @@ msgstr ""
 "���\n"
 "        ���を拒��る�も�れ��ん。\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x形�����指�失効者を追加����ん。\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "指�失効者�ユーザIDを入力������: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x形�����指�失効者�任命����ん\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "指�失効者������自体を任命����ん\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "����失効者���も�指��れ����\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "*警告*: �る�を指�失効者�設定�る��元�戻���ん!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "本当����を指�失効者�任命����? (y/N) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "本当�複数�副��失効期�を変更����? (y/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr "副��有効期�を変更���。\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "主��有効期�を変更���。\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3��有効期��変更����ん\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 msgid "Changing usage of a subkey.\n"
 msgstr "副��使用法を変更���。\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 msgid "Changing usage of the primary key.\n"
 msgstr "主��使用法を変更���。\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "署��る副�%s����相互証明�れ����\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "副� %s �署�を������相互証明�必���り��ん\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "ユーザIDを���り����択������。\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ユーザID\"%s\"�v3自己署�をスキップ���\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr "優先�サー�URLを入力������: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "本当�置��������? (y/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "本当�削除������? (y/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 msgid "Enter the notation: "
 msgstr "注釈を入力: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 msgid "Proceed? (y/N) "
 msgstr "進����? (y/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d番�ユーザID��り��ん\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "�ッシュ%s�ユーザID��り��ん\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "�ID'%s'�副���り��ん\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d番�副���り��ん\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ユーザID:\"%s\"\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s�%s%s%s�署��れ����\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (エクス�ート��)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "��署��%s�期�切れ��。\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�れ�も本当�失効������? (y/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "��署��対�る失効証明書を作�����? (y/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�れら�ユーザID��%s�署�����:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr " (失効��)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "�����%s�%s�失効�れ����\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "�れら�署�を失効�よ�������:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "失効証明書を本当�作�����? (y/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "秘密���り��ん\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "ユーザID���も�を失効�よ������: %s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ユーザID\"%s\"��も�失効�れ����\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "*警告*: ユーザID署���%d秒未���\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "最後�有効�ユーザID�失効����ん。\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "� %s ��も�失効�れ����。\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "副� %s ��も�失効�れ����。\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (大��%ld) ��%s (uid %d) �フォトID���表示\n"
@@ -5442,6 +5453,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "電�メール�アドレスを本�やコメント�入れ��よ��\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr "�����ユーザID��������存在�����!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5748,53 +5763,53 @@ msgstr "無効��サー�・プロトコル�� (us %d!=handler %d)\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\"�ID���り��ん: スキップ���\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "%d本��を%s�ら更新\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "*警告*: �%sを%s経由�更新����ん: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�\"%s\"��サー��見��り��ん\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "���サー��見��り��ん\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "�%sを%s��求\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "�サー����り��ん\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "\"%s\"をスキップ����: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "�%sを%s��信\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "�を'%s'�ら�求\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "*警告*: URI %s �らデータを�れ��ん: %s\n"
@@ -5824,67 +5839,67 @@ msgstr "�明�アルゴリズム%d.%s�よる暗�化\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "�明�ダイジェスト・アルゴリズム�生��れ�パスフレーズ %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr "公開��%s��\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "%s�, ID %s, 日付%s�暗�化�れ���\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s�, ID %s�暗�化�れ���\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "*警告*: 複数�プレインテクスト�見られ��\n"
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu 個�パスフレーズ�暗�化\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 個�パスフレーズ�暗�化\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公開��復��失敗����: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "公開��よる暗�化済�データ: 正��DEK��\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s暗�化済�データを仮定\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA暗�方��利用�能����楽天的���%s�代用�よ�������\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "*警告*: メッセージ�完全性��護�れ����ん\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -5894,179 +5909,179 @@ msgstr ""
 "��メッセージ���ら�正当��ょ�。当時�整�性�護�広�使�れ\n"
 "�����������。\n"
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "�れ�も復��る��オプション '%s' を使���。\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "復��強制的�失敗��れ���!\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "復���功\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "*警告*: 暗�化�れ�メッセージ�改竄�れ����!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "復��失敗����: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "注�: �信者�\"極秘��る\"よ��求�����\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "元�ファイル�='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "スタンドアロン失効 - \"gpg --import\"を使���用������\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, c-format
 msgid "no signature found\n"
 msgstr "署��見��り��ん\n"
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\"�ら�*�正�*署�"
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\"�ら�期�切れ�署�"
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\"�ら�正��署�"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "署��検証を�略\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "�������署�データ��り扱���ん\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr "%s�施�れ�署�\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s�%sを使用\n"
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s�%s�ID %s�施�れ�署�\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               発行者\"%s\"\n"
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "以下����り��: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "注�: ��情報を利用�る�� '%s' を使������\n"
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[�確定]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                別�\"%s\""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "*警告*: ����%sモード��署������ん!\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "期�切れ�署� %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "��署��%s�期�切れ��り��\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s署��ダイジェスト・アルゴリズム %s%s%s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "�イナリ"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "テキストモード"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "�明�"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 msgid ", key algorithm "
 msgstr "��アルゴリズム "
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 "*警告*: 分�署����り��ん。ファイル「%s��検証�れ*��ん���*!\n"
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "署�を検査����ん: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "分�署���り��ん\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "*警告*: 多�署��検出。最��も���検査���。\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "クラス0x%02x�スタンドアロン署�\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "��形� (PGP 2.x) �署�\n"
@@ -6136,11 +6151,6 @@ msgstr "(より詳細�情報: "
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: 廃止�れ�オプション\"%s\"\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "*警告*: \"%s\"��廃止�れ�オプション��\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7177,133 +7187,133 @@ msgstr "'%s'�読�込�エラー: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "信用データベース: �期�失敗����: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "'%s'�ロックを作�����ん\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "'%s'�ロック����ん\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信用データベース レコード%lu: シーク�失敗����: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信用データベース レコード%lu: 書�込��失敗���� (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "信用データベース�トランザクション�大�����\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: ディレクトリ��り��ん!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "'%s'�アクセス����ん: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: �ージョン・レコード�作��失敗����: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: 無効�信用データベースを作�\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: 信用データベース������\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "注�: 信用データベース��書�込��能��\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: 無効�信用データベース\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: �ッシュ表�作��失敗����: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: �ージョン・レコード�更新エラー: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: �ージョン・レコード�読�込�エラー: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: �ージョン・レコード�書�込�エラー: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信用データベース: シーク�失敗����: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信用データベース: 読�込��失敗���� (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: 信用データベース・ファイル���り��ん\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: レコード番�%lu番��ージョン・レコード\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: 無効�ファイル・�ージョン%d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: 空�レコード�読�込�エラー: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ディレクトリ・レコード�書�込�エラー: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: レコード��期化�失敗����: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: レコード�追加�失敗����: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "エラー: 信用データベース�壊れ����。\n"
@@ -7894,16 +7904,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%s番�: %s%%0A��者: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "残�れ�試行回数: %d"
@@ -7932,10 +7942,10 @@ msgstr "|N|��ら��アンブロッキングキーを入力�����
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "||����PIVカード�アンブロッキングキーを入力������"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PINコール�ック�エラーを返����: %s\n"
@@ -7955,151 +7965,151 @@ msgstr "PIN�長����。最長�%d��\n"
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr "PIN�無効�文字��り��。数字���使���\n"
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr "��も��り��\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "既存���置���られ��\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr "新���を生�\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, c-format
 msgid "writing new key\n"
 msgstr "新���を書�込�\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "���管�失敗����: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "応答�RSA�モジュラス���れ����ん\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "応答�RSA公開指数���れ����ん\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "応答�楕円曲線�公開����れ����ん\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "�生��間��待����� ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr "��生��失敗����\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "��生��完了���� (%d秒)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "応答�公開�データ���れ����ん\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||新��PINを�定署�を生��る�����入力������。"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|管�者PINを入力������"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|標準���PIN Unblocking Code (PUK)を入力������。"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||PINを標準������入力������。"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA�モジュラス�����%dビット�も����り��ん\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA公開指数���� %d ビットより大�����\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 msgid "Note: PIN has not yet been enabled."
 msgstr "注�: PIN���有効�������ん"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN�変更�れ����ん\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|新��PINを標準������入力������。"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|標準���新��PIN Unblocking Code (PUK)を入力������。"
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|新��PINを�定署�を生��る�����入力������。"
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 "|NP|�定署�������新��PINブロック解除コード(PUK)を入力������。"
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 "|P|�定署�������新��PINブロック解除コード(PUK)を入力������。"
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "新��PIN��得エラー: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "指紋��管�失敗����: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "生�日��管�失敗����: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "カード�らCHVステイタス��得�エラー\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "公開��読�込��失敗����: %s\n"
@@ -8107,64 +8117,64 @@ msgstr "公開��読�込��失敗����: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%s番�: %s%%0A��者: %s%%0Aカウンタ: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "デフォルトPINを%s���使���\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "デフォルト�PIN %s を使���失敗����: %s - �れ以上デフォルト����使"
 "用を無効����\n"
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 msgid "||Please unlock the card"
 msgstr "||カードをアンロック������"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d�PIN�短����。最短�%d��\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d��証�失敗����: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "カード�永久�ロック�れ���!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
 "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr[0] "カード�永久ロック��%d回�管�者PIN�試行�残�����\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "管�コマンド��アクセス�設定�れ����ん\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 msgid "||Please enter the PIN"
 msgstr "||PINを入力������"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 msgid "||Please enter the Reset Code for the card"
 msgstr "||カード�リセット・コードを入力������"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "リセット・コード�短����。最短�長��%d��。\n"
@@ -8172,78 +8182,78 @@ msgstr "リセット・コードã�ŒçŸ­ã�™ã�Žã�¾ã�™ã€‚最短ã�®é•·ã�•ã�¯%dã�§ã�™ã
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr "|RN|新��リセット・コード"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新��管�者PIN"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr "|N|新��PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||管�者PIN�新��管�者PINを入力������"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 msgid "||Please enter the PIN and New PIN"
 msgstr "||PIN�新��PINを入力������"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr "アプリケーション・データ�読�込�エラー\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "フィンガープリント�データ・オブジェクト�読�込�エラー\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "作�時刻スタンプ��り��ん\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA素数 %s ��り��ん����%dビット�も����り��ん\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, c-format
 msgid "unsupported curve\n"
 msgstr "サ�ート�れ����曲線\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGPカード�無効�構造 (データ・オブジェクト 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "カード�フィンガープリント��求�れ�も��一致���ん\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "カード�ダイジェスト・アルゴリズム %s をサ�ート�����ん\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "�れ���作��れ�署�: %lu\n"
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "管�者PIN�確����コマンド��今�����止�れ����\n"
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�アクセス����ん - 無効�OpenPGPカード?\n"
@@ -8263,7 +8273,7 @@ msgstr "|N|�期�新��PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "マル�・サー�・モード(フォアグラウンド)�実行"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|デ�ッグ・レベルをLEVEL����"
 
@@ -8307,11 +8317,11 @@ msgstr "|LIST|アプリケーション�優先度をLIST��る"
 msgid "deny the use of admin card commands"
 msgstr "管�カード・コマンド�使用を拒�"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "使�方: @SCDAEMON@ [オプション] (ヘルプ� -h)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8319,24 +8329,24 @@ msgstr ""
 "形�: scdaemon [オプション] [コマンド [引数]]\n"
 "@GNUPG@�Smartcardデーモン\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "'--daemon'オプションを使���プログラムを�ックグラウンド�実行�����"
 "�\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d��ンドラ�開始�れ���\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d��ンドラ�終了����\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -8565,7 +8575,7 @@ msgstr "ルート証明書�信用��る�マーク�れ����ん"
 msgid "checking the trust list failed: %s\n"
 msgstr "信用リスト�検査�失敗����: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "証明書��ェイン�長����\n"
@@ -8620,7 +8630,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%uビット�ッシュ�%uビット�%s���無効��\n"
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
@@ -8666,42 +8676,42 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "作� %s, 有効期� %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "��使�方�指定�れ����ん - ����使��を仮定���\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "証明書�証明����使�れる�����り��ん���\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "証明書�OCSP応答�署�����使�れる�����り��ん���\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "証明書�暗�化����使�れる�����り��ん���\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "証明書�署�����使�れる�����り��ん���\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "証明書�暗�化����使���ん\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "証明書�署�����使���ん\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "別�証明書を探�\n"
@@ -8889,6 +8899,11 @@ msgstr "自己署�証明書を作�����? (y/N) "
 msgid "These parameters are used:\n"
 msgstr "下記�パラメータ�使�れ��:\n"
 
+#: sm/certreqgen-ui.c:433
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "一時ファイル�作�エラー: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr "今�自己署�証明書を作������。  "
@@ -8959,123 +8974,123 @@ msgstr "証明書'%s'�削除�失敗����: %s\n"
 msgid "no valid recipients given\n"
 msgstr "有効����り手�指定�れ����ん\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "list external keys"
 msgstr "外部�を一覧�る"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "list certificate chain"
 msgstr "証明書��ェインを表示�る"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 msgid "import certificates"
 msgstr "証明書をイン�ート�る"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "export certificates"
 msgstr "証明書をエクス�ート�る"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr "スマートカードを登録�る"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr "dirmngr�コマンドを渡�"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr "gpg-protect-toolを起動�る"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "端末を����使���"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr "|N|インクルード�る証明書�数"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|�リシー情報をFILE�ら�得�る"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr "PEMフォーマット�入力を仮定�る"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr "base-64フォーマット�入力を仮定�る"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr "�イナリ・フォーマット�入力を仮定�る"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 msgid "create base-64 encoded output"
 msgstr "base-64形��出力を作�"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|USER-IDをデフォルト�秘密����使�"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|�リングを�リング�リスト�追加"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr "紛失���る発行者証明書を�得�る"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|PKCS#12�パスフレーズ�NAME�エンコーディングを使�"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr "決��CRLを調���"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr "ルート証明書�CRLを�ェック���"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr "OCSPを用��有効性を確��る"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr "証明書�リシーを�ェック���"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|暗�アルゴリズム�NAMEを使用"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|ダイジェスト・アルゴリズム�NAMEを使用"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "�ッ�・モード: ��もユーザ��������"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "��ん��設��yesを仮定�る"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "��ん��設��noを仮定�る"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|監査ログをFILE�書�出�"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "使�方: @GPGSM@ [オプション] [ファイル] (ヘルプ� -h)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9085,27 +9100,27 @@ msgstr ""
 "S/MIMEプロトコルを用���署��検査�暗�化や復�を行���\n"
 "デフォルト��作��入力データ��存���\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "注�:'%s'�対��暗�化����ん: %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "�明�検証モデル '%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "共通証明書�イン�ート・エラー: %s\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "'%s'を用��署�����ん: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "無効�コマンド (暗黙�コマンド��り��ん)\n"
@@ -9135,7 +9150,7 @@ msgstr "�存�れ�フラグ��得エラー: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "証明書�イン�ート・エラー: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "入力読�込�エラー: %s\n"
@@ -9175,7 +9190,7 @@ msgstr "証明書��検索��題: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "フラグ��存エラー: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "エラー - "
 
@@ -9548,11 +9563,6 @@ msgstr "一時キャッシュ・ディレクトリ・ファイル'%s'ã�Œä½œæˆ�ã�
 msgid "error closing '%s': %s\n"
 msgstr "'%s'�クローズ�エラー: %s\n"
 
-#: dirmngr/crlcache.c:948
-#, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "'%s'�ら'%s'���変更�エラー: %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
@@ -10226,92 +10236,92 @@ msgstr "有効�debugレベル�: %s\n"
 msgid "usage: %s [options] "
 msgstr "使�方: %s [オプション] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "コロン�ソケット��許�れ��ん\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "'%s'�らCRL��得�失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "'%s'�らCRL�処��失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: 行�長���� - スキップ�れ���\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: 無効�フィンガープリント�検出�れ���\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: 読�込�エラー: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: 行末�ゴミを無視\n"
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "SIGHUPを���り - 設定を読�直��キャッシュをフラッシュ\n"
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2を���り - 動作�定義�れ��\n"
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERMを���り - シャットダウン...\n"
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERMを���り - %d本�アクティブ�接続����り��\n"
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, c-format
 msgid "shutdown forced\n"
 msgstr "強制的�シャットダウン�る\n"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINTを���り - ���シャットダウン\n"
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "シグナル%dを���り - アクション�定義�れ��\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "'%s'�アクセス�エラー: httpステイタス %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL'%s' � '%s' (%u) �リダイレクト�れ���\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "リダイレクト�多����\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "リダイレクト�'%s'�変更�れ���\n"
@@ -10674,55 +10684,55 @@ msgstr "証明書�ェイン�正����\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "証明書�CRL署�����使�れる�����り��ん���\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "�����"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr "16進�エンコード��データ出力を表示�る"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr "�信��データ行をデコード�る"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr "dirmngr�接続"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "connect to the keyboxd"
 msgstr "keyboxd�接続"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|Assuan�ソケット�NAME�接続�る"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|ADDR�Assuanサー��接続�る"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr "コマンド・ライン�与�られ�Assuanサー�を実行�る"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr "拡張接続モードを使���"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|起動時�FILE�らコマンドを実行�る"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr "起動時� /subst を実行�る"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "使�方: @GPG@-connect-agent [オプション] (ヘルプ� -h)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -10730,48 +10740,48 @@ msgstr ""
 "形�: @GPG@-connect-agent [オプション]\n"
 "実行中�agent�接続��コマンドを�る\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "オプション\"%s\"�プログラム�オプショナル�引数を����\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "オプション\"%s\"�\"%s\"���無視�れ���\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "行��信�失敗����: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "行�長���� - スキップ�れ���\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "組込��Nulキャラクタ���行�短��れ���\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "�明�コマンド'%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "行��信�失敗����: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "��セッション�keyboxデーモン�実行�れ����ん\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "標準オプションを�信エラー: %s\n"
@@ -10831,12 +10841,12 @@ msgstr "コン�ー�ント%s�外部�検証�失敗����"
 msgid "Note that group specifications are ignored\n"
 msgstr "グループ仕様�無視�れ��る���注�������\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "'%s'�クローズ�エラー\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "'%s'�パーズ�エラー\n"
@@ -11018,6 +11028,12 @@ msgstr "Yubikey管�コマンド"
 msgid "manage the command history"
 msgstr "コマンド履歴を管��る"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "一時ファイル�書�込�エラー: %s\n"
+
+#~ msgid "run in supervised mode"
+#~ msgstr "スーパー�イズド・モード�実行"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "��を数字�始�������ん\n"
 
@@ -11350,9 +11366,6 @@ msgstr "コマンド履歴を管��る"
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "%sを書�込��オープン����ん���: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "'%s'�書�込�エラー: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "'%s'�クローズ�エラー: %s\n"
 
diff --git a/po/nb.gmo b/po/nb.gmo
index c1c68b6..5c1dd27 100644
--- a/po/nb.gmo
+++ b/po/nb.gmo
diff --git a/po/nb.po b/po/nb.po
index 06f3a8d..ce2f18f 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2017-11-02 17:40+0100\n"
 "Last-Translator: Ã…ka Sikrom <a4@hush.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -23,7 +23,7 @@ msgstr ""
 "X-Generator: Poedit 1.8.7.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "klarte ikke å skaffe pin-inntastingslås: %s\n"
@@ -34,49 +34,49 @@ msgstr "klarte ikke å skaffe pin-inntastingslås: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Avbryt"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Ja"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_Nei"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Lagre i passordbehandler"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Er du sikker på at du vil gjøre passordfrasen synlig på skjermen?"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Gjør passordfrase synlig"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Skjul passordfrase"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -87,7 +87,7 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -98,14 +98,14 @@ msgstr ""
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -113,7 +113,7 @@ msgstr "For lang passordfrase"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -123,20 +123,20 @@ msgstr "Kvalitet:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Kvaliteten på teksten overfor. Spør administrator for mer informasjon om "
 "hvordan kvaliteten vurderes."
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 "Skriv inn PIN-kode slik at hemmelig nøkkel kan låses opp for denne økta"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -144,76 +144,76 @@ msgstr ""
 "Skriv inn passordfrasen din, slik at hemmelig nøkkel kan låses opp for "
 "gjeldende økt"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Passordfrase:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "feil. Prøv igjen"
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (forsøk %d av %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr "Gjenta:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 msgid "PIN too long"
 msgstr "For lang PIN"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 msgid "Passphrase too long"
 msgstr "For lang passordfrase"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 msgid "Invalid characters in PIN"
 msgstr "Ugyldig tegn i PIN"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr "Koden er for kort"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad PIN"
 msgstr "Ugyldig PIN"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad Passphrase"
 msgstr "Ugyldig passordfrase"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Skriv inn denne passordfrasen på nytt"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, 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:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -236,24 +236,24 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nøkler som er lenger enn %d bit støttes ikke\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, 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
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, 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:2513
+#: agent/command-ssh.c:2467
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "feil under henting av kortliste: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, 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:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Tillat"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Avvis"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Skriv inn passordfrase for ssh-nøkkel%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -299,90 +299,82 @@ 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:3708
+#: agent/command-ssh.c:3797
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "klarte ikke å lage strøm av sokkel: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Sett inn kort med serienummer"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "Admin-PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Tilbakestillingskode"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0ABruk leserens kodeplate til å skrive."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Gjenta tilbakestillingskode"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Gjenta PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Gjenta PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Tilbakestillingskode ble ikke gjentatt korrekt. Prøv igjen"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK-kode ble ikke gjentatt korrekt. Prøv igjen"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN ble ikke gjentatt korrekt. Prøv igjen"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Skriv inn PIN-kode%s%s%s for å låse opp kort"
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "feil under oppretting av midlertidig fil: %s\n"
-
-#: agent/genkey.c:150
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "feil under skriving til midlertidig fil: %s\n"
+#: agent/genkey.c:154
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "feil under skriving til %s: %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 msgid "Enter new passphrase"
 msgstr "Skriv inn ny passordfrase"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 "Du har ikke skrevet inn en passordfrase.%0ATom passordfrase er ikke tillatt."
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -391,18 +383,18 @@ msgstr ""
 "Du har ikke skrevet inn en passordfrase. Dette er generelt ikke lurt."
 "%0ABekreft at du ikke vil beskytte nøkkelen."
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr "Ja, beskyttelse er unødvendig"
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "Passordfraser skal bestå av minst %u tegn."
 msgstr[1] "Passordfraser skal bestå av minst %u tegn."
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -410,240 +402,236 @@ msgid_plural ""
 msgstr[0] "Passordfraser bør inneholde minst %u siffer eller%%0Aspesialtegn."
 msgstr[1] "Passordfraser bør inneholde minst %u sifre eller%%0Aspesialtegn."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr "Ikke bruk kjente ord, uttrykk eller kjente mønster%%0Ai passordfraser."
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Advarsel: du har skrevet inn en svak passordfrase."
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 msgid "Take this one anyway"
 msgstr "Bruk denne likevel"
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Skriv inn passordfrase for å%0Abeskytte ny nøkkel"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 msgid "Please enter the new passphrase"
 msgstr "Skriv inn ny passordfrase"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Nyttige feilsøkingsvalg"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr "kjør som bakgrunnsprosess («daemon»)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr "kjør i tjenermodus (forgrunn)"
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-msgid "run in supervised mode"
-msgstr "kjør i «supervised» modus"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr "ikke løsne fra konsoll"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr "sh-utdata for kommandoer"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr "csh-utdata for kommandoer"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|les valg fra valgt FIL"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr "Styring av diagnostikk-utdata"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "detaljert utskrift"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "være noenlunde stille"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FIL|skriv tjenermodus-logger til valgt FIL"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr "Oppsettsvalg"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "ikke bruk SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|bruk PGN som SCdaemon-program"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|bruk PGN som SCdaemon-program"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|godta enkelte kommandoer via «NAME»"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignorer forespørsler om å bytte TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignorer forespørsler om å bytte X-skjerm"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "slå på ssh-støtte"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|bruk valgt ALGOritme til å vise ssh-fingeravtrykk"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "slå på støtte for putty"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "Sikkerhetsvalg"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|fjern hurtiglagrede PIN-koder etter N sekunder"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|SSH-nøkler utgår etter N antall sekunder"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 "|N|endre maksimal livstid for PIN-koder i hurtiglager til N antall sekunder"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|endre maksimal livstid for SSH-nøkler til N antall sekunder"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr "ikke bruk PIN-hurtiglager under signering"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 msgid "disallow the use of an external password cache"
 msgstr "ikke tillat bruk av eksternt passord-hurtiglager"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "ikke la klienter tillitsmarkere nøkler"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 msgid "allow presetting passphrase"
 msgstr "tillat valg av passordfrase på forhånd"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr "Valg som håndhever passordfrase-regler"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr "ikke tillat avvik fra passordregler"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|endre minimal passordfrase-lengde til N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|krev at passordfraser inneholder minst N antall spesialtegn og tall"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FIL|kontroller nye passordfraser mot mønster i valgt FIL"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|regn passord som ugyldig etter N antall dager"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 msgid "do not allow the reuse of old passphrases"
 msgstr "ikke tillat gjenbruk av gamle passordfraser"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Sikkerhetsvalg"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr "ikke la kaller overstyre PIN-inntasting"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "ikke bruk tastatur og mus"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|bruk PGM til inntasting av PIN-koder"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|endre tidsavbrudd for PIN-inntasting til N antall sekunder"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "la brukeren skrive inn passordfrase via Emacs"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Rapporter programfeil til <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Bruk: @GPG_AGENT@ [valg] («-h» for hjelp)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -651,131 +639,136 @@ msgstr ""
 "Syntaks: @GPG_AGENT@ [valg] [kommando [arg]]\n"
 "Håndtering av hemmelige nøkler for @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "«%s» er et ugyldig feilsøkingsnivå\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg kontrollsum-algoritme er ugyldig\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "leser valg fra «%s»\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "ADVARSEL: valget «%s» er utgått\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "klarte ikke å lage sokkel: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "sokkelnavnet «%s» er for langt\n"
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "feil under henting av sokkel-anledning\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "feil under knytning av sokkel til «%s»: %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "klarte ikke å endre tillatelser til «%s»: %s\n"
 
-#: agent/gpg-agent.c:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "lytter på sokkel «%s»\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "klarte ikke å lage mappa «%s»: %s\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "mappa «%s» er opprettet\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() mislyktes for «%s»: %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "«%s» kan ikke brukes som hjemmemappe\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, 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:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "startet behandler 0x%lx for fd %d\n"
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "avsluttet behandler 0x%lx for fd %d\n"
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, 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:2832
+#: agent/gpg-agent.c:2842
 #, 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:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect mislyktes: %s - venter 1s\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppet\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kjører i gjeldende økt\n"
@@ -800,7 +793,7 @@ msgstr ""
 "Syntaks: gpg-preset-passphrase [valg] KEYGRIP\n"
 "Vedlikehold av hurtiglager for passord\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -810,7 +803,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -865,42 +858,42 @@ msgstr "avbrutt\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "feil under spørring etter passordfrase: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "feil under åpning av «%s»: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "fil «%s», linje %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "uttrykk «%s» ignorert i «%s», linje %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "system-tillitsliste «%s» er ikke tilgjengelig\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "ugyldig fingeravtrykk i «%s», linje %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "ugyldig nøkkelvalg i «%s», linje %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "feil under lesing av «%s», linje %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "feil under lesing av liste over tillitsmerkede rotsertifikater\n"
@@ -913,7 +906,7 @@ msgstr "feil under lesing av liste over tillitsmerkede rotsertifikater\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -922,11 +915,11 @@ msgstr ""
 "Stoler du fullstendig på at%%0A  «%s»%%0Asertifiserer brukersertifikater "
 "korrekt?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr "Nei"
@@ -939,7 +932,7 @@ msgstr "Nei"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -949,21 +942,26 @@ msgstr "Kontroller at sertifikatet%%0A  «%s»%%0Ahar fingeravtrykket%%0A  %s"
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr "Riktig"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr "Feil"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "klarte ikke å gi «%s» det nye navnet «%s»: %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Merk: denne passordfrasen har aldri blitt endret.%0AEndre den umiddelbart."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -972,15 +970,29 @@ msgstr ""
 "Denne passordfrasen har ikke blitt endret%%0Asiden %.4s-%.2s-%.2s. Endre den "
 "umiddelbart."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 msgid "Change passphrase"
 msgstr "Endre passordfrase"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr "Jeg endrer senere"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr "Sett inn kort med serienummer"
+
+#: 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?"
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+"En ssh-prosess ber om tillatelse til å brukt nøkkel%%0A  %s%%0A  (%s)%%0AVil "
+"du tillate dette?"
+
+#: agent/findkey.c:1741
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -988,11 +1000,11 @@ msgid ""
 msgstr ""
 "Er du sikker på at du vil slette nøkkel med nøkkelgrep%%0A  %s%%0A  %%C%%0A?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 msgid "Delete key"
 msgstr "Slett nøkkel"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1017,7 +1029,7 @@ msgstr "%s nøkkel bruker utrygg kontrollsum (%u bit)\n"
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "kontrollsum på %zu bit er ugyldig for %u-bits %s-nøkler\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontroll av opprettet signatur mislyktes: %s\n"
@@ -1056,7 +1068,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "feil under kopiering av prosess: %s\n"
@@ -1118,12 +1130,12 @@ 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:905
+#: common/sysutils.c:880
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "venter på at fila «%s» skal bli tilgjengelig …\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "klarte ikke å gi «%s» det nye navnet «%s»: %s\n"
@@ -1343,7 +1355,7 @@ msgid "algorithm: %s"
 msgstr "algoritme: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "ustøttet algoritme: %s"
@@ -1498,7 +1510,7 @@ msgstr "konvertering fra «%s» til «%s» er ikke tilgjengelig\n"
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open mislyktes: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "konvertering fra «%s» til «%s» mislyktes: %s\n"
@@ -1537,7 +1549,7 @@ msgstr "lås «%s» ikke opprettet: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "venter på lås %s …\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s er for gammel (krever %s, har %s)\n"
@@ -1706,7 +1718,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "ingen dirmngr kjører i gjeldende økt\n"
@@ -1751,7 +1763,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "lag opphevelsessertifikat"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1779,7 +1791,7 @@ msgstr "du kan ikke gjøres dette i buntmodus\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Denne kommandoen er bare tilgjengelig for kort av versjon 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Tilbakestillingskode er ikke tilgjengelig\n"
@@ -1844,14 +1856,14 @@ msgstr "Adresse for henting av offentlig nøkkel: "
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "feil under lesing av «%s»: %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
@@ -2203,26 +2215,26 @@ msgstr "Admin-kommandoer er ikke tillatt\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando  (prøv «help»)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "«--output» virker ikke med denne kommandoen\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "klarte ikke å åpne «%s»\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "fant ikke nøkkelen «%s»: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2282,8 +2294,8 @@ msgid "subkey"
 msgstr "undernøkkel"
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
@@ -2345,14 +2357,14 @@ msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2375,7 +2387,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "ADVARSEL: nøkkel %s egner seg ikke for kryptering i %s-modus\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2479,12 +2491,12 @@ msgstr "eksportering av hemmelige nøkler er ikke tillatt\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "nøkkel %s: PGP 2.x-aktig nøkkel - hoppet over\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: ingenting eksportert\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, c-format
 msgid "error creating '%s': %s\n"
@@ -2548,284 +2560,284 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "følgende verdier er gyldige for «%s»:\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 msgid "make a signature"
 msgstr "lag signatur"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "make a clear text signature"
 msgstr "lag klartekst-signatur"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "lag adskilt signatur"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "krypter data"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "krypter data (symmetrisk)"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "dekrypter data (forvalgt)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "bekreft signatur"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "vis nøkler"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "vis nøkler og signaturer"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr "vis og kontroller nøkkelsignaturer"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "vis nøkler og fingeravtrykk"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "vis hemmelige nøkler"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "lag nytt nøkkelpar"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 msgid "quickly generate a new key pair"
 msgstr "lag nytt nøkkelpar raskt"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "quickly add a new user-id"
 msgstr "legg til en ny bruker-ID raskt"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 msgid "quickly revoke a user-id"
 msgstr "opphev bruker-ID raskt"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly set a new expiration date"
 msgstr "endre utløpsdato raskt"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr "fullverdig generering av nøkkelpar"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "lag opphevelsessertifikat"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "fjern nøkler fra offentlig nøkkelknippe"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "fjern nøkler fra hemmelig nøkkelknippe"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "quickly sign a key"
 msgstr "hurtigsigner nøkkel"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "quickly sign a key locally"
 msgstr "hurtigsigner nøkkel lokalt"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "quickly revoke a user-id"
 msgid "quickly revoke a key signature"
 msgstr "opphev bruker-ID raskt"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "signer nøkkel"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "signer nøkkel lokalt"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "signer eller rediger nøkkel"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "endre passordfrase"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "eksporter nøkler"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "eksporter nøkler til nøkkeltjener"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "importer nøkler fra nøkkeltjener"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "søk etter nøkler på nøkkeltjener"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "oppdater alle nøkler fra nøkkeltjener"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "importer/slå sammen nøkler"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr "vis kortstatus"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr "endre data på kort"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr "endre PIN på kort"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "oppdater tillitsdatabase"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid "print message digests"
 msgstr "skriv ut kontrollsum av melding"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "kjør i tjenermodus"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VERDI|endre TOFU-regler for nøkkel"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAVN|bruk valgt NAVN som forvalgt hemmelig nøkkel"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 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:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr "|SPES|sett opp e-post-alias"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr "bruk streng OpenPGP-oppførsel"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "ikke utfør valgte endringer"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "spør før overskriving"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Sikkerhetsvalg"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Styring av diagnostikk-utdata"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "lag ASCII-beskyttet utdata"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|skriv utdata til valgt FIL"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "bruk kanonisk tekstmodus"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|endre komprimeringsnivå til N (0 for å slå av)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 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:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MEKANISMER|bruk valgte MEKANISME til å finne nøkler med e-postadresse"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importer nøkler fra nøkkeltjener"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "vis og kontroller nøkkelsignaturer"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "slå av all tilgang til dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "Oppsettsvalg"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "vis hemmelige nøkler"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|BRUKER-ID|krypter for valgt BRUKER-ID"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|BRUKER-ID|bruk valgt BRUKER-ID til å signere eller dekryptere"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2833,7 +2845,7 @@ msgstr ""
 "@\n"
 "(Se bruksanvisning for en fullstendig liste over alle kommandoer og valg)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2853,11 +2865,11 @@ msgstr ""
 " --list-keys [navn]         vis nøkler\n"
 " --fingerprint [navn]       vis fingeravtrykk\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Bruk: @GPG@ [valg] [filer] (-h for hjelp)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2867,7 +2879,7 @@ msgstr ""
 "Signer, kontroller, krypter eller dekrypter.\n"
 "Forvalgt handling avhenger av inndata.\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2875,562 +2887,562 @@ msgstr ""
 "\n"
 "Støttede algoritmer:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Off. nøkkel: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Kryptering: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "bruk: %s [valg] %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "fant ingen «=»-tegn i gruppedefinisjon «%s»\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "ADVARSEL: utrygt eierskap til hjemmemappe «%s»\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "ADVARSEL: utrygt eierskap til oppsettsfil «%s»\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "ADVARSEL: utrygt eierskap til utvidelse «%s»\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til hjemmemappe «%s»\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til oppsettsfil «%s»\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til utvidelse «%s»\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "ADVARSEL: utrgt eierskap til foreldermapper av hjemmemappe «%s»\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "ADVARSEL: utrgt eierskap til foreldermapper av oppsettsfil «%s»\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "ADVARSEL: utrgt eierskap til foreldermapper av utvidelse «%s»\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av hjemmemappe «%s»\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av oppsettsfil «%s»\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "ADVARSEL: utrygge tillatelser til foreldermapper av utvidelse «%s»\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "oppsettselementet «%s» er ukjent\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr "vis foto-id-er i nøkkelvisning"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 msgid "show key usage information during key listings"
 msgstr "vis informasjon om nøkkelbruk i nøkkelvisning"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr "vis regeladresser i signaturvisning"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 msgid "show all notations during signature listings"
 msgstr "vis alle notater i signaturvisning"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr "vis IETF-standardnotater under signaturvisning"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr "vis brukervalgte notater under signaturvisning"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "vis foretrukne nøkkeltjener-adresser under signaturvisning"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr "vis gyldighet for bruker-ID under nøkkelvisning"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr "vis opphevede og utgåtte bruker-id-er i nøkkelvisning"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr "vis opphevede og utgåtte undernøkler i nøkkelvisning"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 msgid "show the keyring name in key listings"
 msgstr "vis nøkkelknippe-navn i nøkkelvisning"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 msgid "show expiration dates during signature listings"
 msgstr "vis utløpsdatoer i nøkkelvisning"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "«%s» er et ukjent TOFU-regelverk\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(bruk «help» for å vise valg)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Merk: %s er ikke ment for vanlig bruk.\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "«%s» er en ugyldig signatur-utløpstid\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "«%s» er en ugyldig e-postadresse\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "PIN-inntastingsmodus «%s» er ugyldig\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 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:3314
+#: g10/gpg.c:3315
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "«%s» er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "klarte ikke å tolke nøkkeltjener-adresse\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige nøkkeltjener-valg\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "ugyldige nøkkeltjener-valg\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importeringsvalg\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "ugyldige importeringsvalg\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "filtervalget %s er ugyldig\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksporteringsvalg\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "ugyldige eksporteringsvalg\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr "vis bruker-ID under signaturbekreftelse"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr "vis adresser til retningslinjer under signaturbekreftelse"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 msgid "show all notations during signature verification"
 msgstr "vis alle merknader under signaturbekreftelse"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr "vis IETF-standardnotater under signaturbekreftelse"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr "vis selvvalgte merknader under signaturbekreftelse"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "vis adresser til foretrukne nøkkeltjenere under signaturbekreftelse"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 msgid "show user ID validity during signature verification"
 msgstr "vis gyldighet for bruker-ID under signaturbekreftelse"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "vis opphevede og utgåtte bruker-id-er under signaturbekreftelse"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 msgid "show only the primary user ID in signature verification"
 msgstr "bare vis primærbrukerens ID under signaturbekreftelse"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige kontrollvalg\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr "ugyldige kontrollvalg\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "klarte ikke å endre «exec»-sti til %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig «auto-key-locate»-liste\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ugyldig «auto-key-locate»-liste\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "ugyldig argument for valget «%.50s»\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan lage en kjernefil.\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "du kan ikke bruke %s med %s.\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s gir ikke mening med %s.\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "ADVARSEL: kjører med falsk systemtid: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "lar være å kjøre med usikret minne på grunn av %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "valg kontrollsum-algoritme er ugyldig\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt komprimeringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt kontrollsum-algoritme for sertifisering er ugyldig\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "«completes-needed» må være større enn 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "«marginals-needed» må være større enn 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "«max-cert-depth» må være mellom 1 og 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig «default-cert-level» (må være 0, 1, 2 eller 3)\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig «min-cert-level» (må være 0, 1, 2 eller 3)\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Merk: enkel S2K-modus (0) er sterkt frarådet\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K-modus (må være 0, 1 eller 3)\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ugyldig standardoppsett\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig oppsett av krypteringsmetode\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "ugyldig personlig oppsett av krypteringsmetode\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig oppsett av kontrollsummetode\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig oppsett av komprimeringsmetode\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "ugyldig nøkkelstørrelse. Bruker %u bit\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enda med %s\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 #| msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "du kan ikke bruke algoritme «%s» i %s-modus\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "du kan ikke bruke komprimeringsalgoritme «%s» i %s-modus\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke å starte tillitsdatabase (TrustDB): %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "ADVARSEL: mottakere (-r) valgt uten offentlig nøkkelkryptering\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetrisk kryptering av «%s» mislyktes: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "du kan ikke bruke «--symmetric --encrypt» og «--s2k-mode 0» samtidig\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "du kan ikke velge --symmetric --encrypt i %s-modus\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "du kan ikke bruke «--symmetric --sign --encrypt» og «--s2k-mode 0» samtidig\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "du kan ikke velge --symmetric --sign --encrypt i %s-modus\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nøkkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "eksportering som ssh-nøkkel mislyktes: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "søk på nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "oppdatering av nøkkeltjener mislyktes: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "«%s» er en ugyldig summeringsalgoritme\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "feil under tolking av nøkkelspesifikasjon «%s»: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 "«%s» ser hverken ut til å være en gyldig nøkkel-ID, fingeravtrykk eller "
 "nøkkelgrep\n"
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "ADVARSEL: ingen kommando valgt. Prøver å gjette hva du mener …\n"
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv inn melding …\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "valgt adresse for sertifikasjonsregler er ugyldig\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "valgt adresse for signaturregler er ugyldig\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "valgt adresse for foretrukket nøkkeltjener er ugyldig\n"
@@ -3443,7 +3455,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skrive statusinfo til denne FD"
 
@@ -4170,7 +4182,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du sikker på at du vil signerere den? (j/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  Klarte ikke å signere.\n"
 
@@ -4343,8 +4355,8 @@ msgstr "Jeg har sjekket denne nøkkelen veldig nøye.\n"
 msgid "Really sign? (y/N) "
 msgstr "Er du sikker på at du vil signere? (j/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering mislyktes: %s\n"
@@ -4548,7 +4560,7 @@ msgstr ""
 "  (nrsign), eller hvilken som helst kombinasjon av disse (ltsign, tnrsign, "
 "osv.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "Nøkkelen er opphevet."
 
@@ -4596,7 +4608,7 @@ msgstr "Er du sikker på at du vil fjerne valgt bruker-ID? (j/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Er du sikker på at du vil flytte primærnøkkelen? (j/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr "Du må velge minst én nøkkel.\n"
 
@@ -4672,162 +4684,162 @@ msgstr "Vil du lagre endringer? (j/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Vil du avslutte uten å lagre? (j/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Nøkkelen ble ikke endret, så ingen oppdatering er nødvendig.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "klarte ikke å oppheve siste gyldige bruker-ID.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "opphevelse av bruker-id mislyktes: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "endring av primær bruker-ID mislyktes: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "«%s» er ikke et fingeravtrykk\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "«%s» er ikke primært fingeravtrykk\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Bruker-ID «%s» er ugyldig: %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "No matching user IDs."
 msgstr "Ingen treff på bruker-id-er."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "Nothing to sign.\n"
 msgstr "Ingenting å signere.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Ikke signert av deg.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "kontroll av opprettet signatur mislyktes: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "«%s» er en ugyldig utløpstid\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "«%s» er et ugyldig fingeravtrykk\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "fant ikke undernøkkel «%s»\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Kontrollsum: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Funksjoner: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr "Nøkkeltjener no-modify"
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr "Foretrukket nøkkeltjener: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 msgid "Notations: "
 msgstr "Notasjoner: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-brukere har ingen oppsettsmuligheter.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Følgende nøkkel ble opphevet %s av %s med nøkkelen %s\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Denne nøkkelen kan bli opphevet av %s med nøkkelen %s"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "opprettet: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr "opphevet: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr "utgikk: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "utgår: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr "bruk: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr "kortnr.: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr "gyldighet: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Denne nøkkelen er ikke i bruk"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4835,17 +4847,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr "opphevet"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "utgått"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4854,17 +4866,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:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "ADVARSEL: Undernøkkel for kryptering utløper snart.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Du bør vurdere å endre utløpsdato samtidig.\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4874,72 +4886,74 @@ msgstr ""
 "føre til at\n"
 "         enkelte PGP-versjoner avviser nøkkelen.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker på at du vil legge den til? (j/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan ikke knytte foto-ID til PGP2-nøkler.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "Valgt bruker-ID finnes allerede på denne nøkkelen!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slette denne gode signaturen? (j/N/a)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vil du slette denne ugyldige signaturen? (j/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vil du slette denne ukjente signaturen? (j/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Er du sikker på at du vil slette denne selvsignaturen? (j/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, 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:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Ingen ble slettet.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Bruker-ID «%s» pakket sammen: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Bruker-ID «%s»: allerede minimert\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Bruker-ID «%s»: allerede renset\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4949,216 +4963,216 @@ msgstr ""
 "         kan dette føre til at enkelte PGP-versjoner ikke vil kunne bruke "
 "nøkkelen.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Du kan ikke knytte opphevere til PGP 2.x-nøkler.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Skriv inn oppheverens bruker-ID: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "du kan ikke bruke PGP 2.x-nøkler som opphevere\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "du kan ikke bruke en nøkkel som opphevelsesnøkkel for seg selv\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "denne nøkkelen er allerede i bruk som opphevelsesnøkkel\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ADVARSEL: du kan ikke angre tildeling av opphevelsesrolle til en nøkkel.\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Er du sikker på at du vil gjøre denne nøkkelen til en opphever? (j/N) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr ""
 "Er du sikker på at du vil endre utløpstid for flere undernøkler? (j/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Endrer utløpstid for undernøkkel.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Endrer utløpstid for primærnøkkel.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan ikke endre utløpsdato for v3-nøkler\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "Endrer utløpstid for undernøkkel.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Endrer utløpstid for primærnøkkel.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signerings-undernøkkel %s er allerede kryssertifisert\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "undernøkkel %s signerer ikke, og behøver derfor ikke å bli kryssertifisert\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Velg én bruker-ID.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hopper over v3-selvsignatur for bruker-ID «%s»\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr "Skriv inn adresse til foretrukket nøkkeltjener: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker på at du vil erstatte den? (j/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker på at du vil slette den? (j/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 msgid "Enter the notation: "
 msgstr "Skriv inn notat: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 msgid "Proceed? (y/N) "
 msgstr "Vil du fortsette? (j/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruker-ID med indeks %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruker-ID med kontrollsum %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Ingen undernøkkel med ID «%s».\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernøkkel med indeks %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruker-ID: «%s»\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "signert med nøkkelen %s %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (ikke-eksporterbar)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne signaturen utgikk %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Er du sikker på at du vil oppheve den? (j/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vil du lage et opphevelsessertifikat for denne signaturen? (j/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Du har signert disse bruker-id-ene med nøkkelen %s:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr " (kan ikke oppheves)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "opphevet med nøkkelen %s %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du er i ferd med å oppheve følgende signaturer:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Er du sikker på at du vil lage opphevelsessertifikatene? (j/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "ingen hemmelig nøkkel\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "prøvde å oppheve ID som ikke tilhørte en bruker: %s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "bruker-ID «%s» er allerede opphevet\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ADVARSEL: en bruker-id-signatur er datert %d sekunder i framtiden\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Klarte ikke å oppheve siste gyldige bruker-ID.\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nøkkelen %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernøkkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, 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"
@@ -5590,6 +5604,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ikk bruk e-postadresse som navn eller kommentar\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Valgt bruker-ID finnes allerede på denne nøkkelen!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5910,54 +5928,54 @@ msgstr "ugyldig nøkkeltjener-protokoll (us %d!=håndteringsprogram %d)\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "«%s» er ikke en nøkkel-ID, og blir hoppet over\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "oppdaterer %d nøkkel fra %s\n"
 msgstr[1] "oppdaterer %d nøkler fra %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ADVARSEL: klarte ikke å oppdatere nøkkel %s via %s: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "fant ikke nøkkelen «%s» på nøkkeltjener\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "fant ikke nøkkelen på nøkkeltjener\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "ber om nøkkelen %s fra %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "ingen kjent nøkkeltjener\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppet over «%s»: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sender nøkkelen %s til %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "ber om nøkkel fra «%s»\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ADVARSEL: klarte ikke å fange URI %s: %s\n"
@@ -5990,12 +6008,12 @@ msgstr "kryptert med en ukjent algoritme %d\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "passordfrase generert med ukjent summeringsalgoritme %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr "offentlig nøkkel er %s\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
@@ -6003,236 +6021,236 @@ msgstr "kryptert med %u-bit %s-nøkkel, ID %s, opprettet %s\n"
 
 # Do we really need to translate this string.
 # The must some bug in the code.
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      «%s»\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kryptert med %s-nøkkel, ID %s\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "ADVARSEL: fant flere elementer i ren tekst\n"
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "kryptert med %lu passordfraser\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "kryptert med 1 passordfrase\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "offentlig nøkkel-dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "offentlig nøkkel-kryptert data: god DEK\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar %s kryptert data\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA-kryptering er utilgjengelig. Prøver å bruke %s i stedet\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: meldinga var ikke integritetsbeskyttet\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "dekryptering ok\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ADVARSEL: kryptert melding er blitt manipulert.\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekryptering mislyktes: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Merk: senderen spesifiserte «kun for dine øyne»\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "opprinnelig filnavn=«%.*s»\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "selvstendig opphevelse - bruk «gpg --import» for å ta i bruk\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, c-format
 msgid "no signature found\n"
 msgstr "fant ikke signatur\n"
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "DÅRLIG signatur fra «%s»"
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgått signatur fra «%s»"
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra «%s»"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signaturbekreftelse ble hindret\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "disse flertydige signaturdataene kan ikke behandles\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur opprettet %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               bruker %s nøkkel %s\n"
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur laget %s ved hjelp av %s-nøkkel ID %s\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                utsteder «%s»\n"
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Nøkkel tilgjengelig ved: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[usikker]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka «%s»"
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "ADVARSEL: Denne nøkkelen egner seg ikke for signering i %s-modus\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signatur utgått %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signatur utgår %s\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s-signatur, kontrollsum-algoritme %s%s%s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "binær"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "tekstmodus"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "ukjent"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 msgid ", key algorithm "
 msgstr ", nøkkelalgoritme"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "ADVARSEL: ikke en separat signatur. Fila «%s» er IKKE bekreftet.\n"
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Klarte ikke å kontrollere signatur: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "ikke en separat signatur\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "ADVARSEL: fant flere signaturer. Kontrollerer bare den første.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "separat signatur av klasse 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
@@ -6303,11 +6321,6 @@ msgstr "(mer info: "
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: valget «%s» er utgått\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "ADVARSEL: valget «%s» er utgått\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7387,133 +7400,133 @@ msgstr "lesefeil i «%s»: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: synk mislyktes: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "klarte ikke å lage lås for «%s»\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "klarte ikke å låse «%s»\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb-oppf. %lu: lseek mislyktes: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb-oppf. %lu: skriving mislyktes (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "trustdb-transaksjon er for stor\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: mappa finnes ikke.\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "fikk ikke tilgang til «%s»: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: klarte ikke å lage versjonsoppføring: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: laget ugyldig trustdb\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trustdb opprettet\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Merk: trustdb er ikke skrivbar\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ugyldig trustdb\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: klarte ikke å lage kontrollsum-tabell: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: feil under oppdatering av versjonsoppføring: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: feil under lesing av versjonsoppføring: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: feil under skriving av versjonsoppføring: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek mislyktes: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: lesing mislyktes (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: ikke en trustdb-fil\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versjonsoppføring nr. %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: %d er en ugyldig filversjon\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: feil under lesing av «free»-oppføring: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: feil under skriving av «dir»-oppføring: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: klarte ikke å nullstille oppføring: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: klarte ikke å legge til oppføring: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Error: trustdb er skadet.\n"
@@ -8139,16 +8152,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%sNummer\\x1f: %s%%0AHolder\\x1f: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Gjenstående forsøk: %d"
@@ -8189,10 +8202,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-callback returnerte en feil: %s\n"
@@ -8214,153 +8227,153 @@ msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr "nøkkelen finnes allerede\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "gjeldende nøkkel blir erstattet\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr "lager ny nøkkel\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, c-format
 msgid "writing new key\n"
 msgstr "skriver ny nøkkel\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "klarte ikke å lagre nøkkel: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "svar inneholder ikke RSA-modulus\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svar inneholder ikke offentlig RSA-eksponent\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "svar inneholder ikke offentlig EC-nøkkel\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "vent mens nøkkel blir generert …\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr "nøkkelgenerering mislyktes\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "nøkkelgenerering fullført (%d sekund)\n"
 msgstr[1] "nøkkelgenerering fullført (%d sekunder)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "svar inneholder ikke offentlig nøkkeldata\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||Skriv inn PIN for å la nøkkelen lage kvalifiserte signaturer."
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Skriv inn admin-PIN"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Skriv inn PIN-opplåsingskode (PUK) for standardnøkler."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Skriv inn PIN-kode for standardnøkler."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA-modulus mangler eller er av annen størrelse enn %d bit\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "offentlig RSA-eksponent mangler eller er større enn %d bit\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "NullPIN er ikke blitt endret enda\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN er ikke blitt endret enda\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Skriv inn ny PIN-kode for standardnøkler."
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|Skriv inn ny PIN-opplåsingskode (PUK) for standardnøkler."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|Skriv inn ny PIN for å la nøkkelen lage kvalifiserte signaturer."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 "|NP|Skriv inn ny PUK-kode for å la nøkkelen lage kvalifiserte signaturer."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr "|P|Skriv inn PUK-kode for å la nøkkelen lage kvalifiserte signaturer."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "feil under henting av ny PIN: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "klarte ikke å lagre fingeravtrykk: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "klarte ikke å lagre opprettelsesdato: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "feil under henting av CHV-status fra kort\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "lesing av offentlig nøkkel mislyktes: %s\n"
@@ -8368,44 +8381,44 @@ msgstr "lesing av offentlig nøkkel mislyktes: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNummer\\x1f: %s%%0AHolder\\x1f: %s%%0ATeller\\x1f: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "bruker forvalgt PIN som %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "klarte ikke å bruke forvalgt PIN som %s: %s. Lar være å bruke forvalgt PIN "
 "senere\n"
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 msgid "||Please unlock the card"
 msgstr "||LÃ¥s opp kort"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "bekreftelse av CHV%d mislyktes: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kortet er låst for godt.\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8413,20 +8426,20 @@ msgid_plural ""
 msgstr[0] "%d Admin-PIN-forsøk gjenstår før kortet blir låst permanent\n"
 msgstr[1] "%d Admin-PIN-forsøk gjenstår før kortet blir låst permanent\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 msgid "||Please enter the PIN"
 msgstr "||Skriv inn PIN-kode"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Skriv inn tilbakestillingskode for kortet"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Tilbakestillingskoden er for kort. Minimumslengde er %d\n"
@@ -8434,78 +8447,78 @@ msgstr "Tilbakestillingskoden er for kort. Minimumslengde er %d\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr "|RN|Ny tilbakestillingskode"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Skriv inn admin-PIN og ny admin-PIN"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Skriv inn PIN-kode og ny PIN-kode"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr "feil under lesing av programdata\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "feil under lesing av fingeravtrykk DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "tidsstempel for opprettelse mangler\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA-primtall %s mangler eller er av annen størrelse enn %d bit\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, c-format
 msgid "unsupported curve\n"
 msgstr "ustøttet kurve\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "fingeravtrykk på kort samsvarer ikke med forespurt avtrykk\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet støtter ikke kontrollsum-algoritme %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer opprettet så langt: %lu\n"
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "bekrefting av Admin PIN er foreløpig nektet gjennom denne kommandoen\n"
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "fikk ikke tilgang til %s. Bruker du et ugyldig OpenPGP-kort?\n"
@@ -8525,7 +8538,7 @@ msgstr "|N|Ny PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "kjør i multi-tjenermodus (forgrunn)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVÅ|endre feilsøkingsnivå til valgt NIVÅ"
 
@@ -8569,11 +8582,11 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "avvis bruk av admin-kortkommandoer"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Bruk: @SCDAEMON@ [valg] (-h for hjelp)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8581,22 +8594,22 @@ msgstr ""
 "Syntaks: scdaemon [valg] [kommando [arg]]\n"
 "Smartcard-bakgrunnsprogram for @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "bruk valget «--daemon» for å kjøre programmet i bakgrunnen\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "startet håndteringsprogram for fd %d\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "avsluttet håndteringsprogram for fd %d\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -8823,7 +8836,7 @@ msgstr "rotsertifikat er ikke merket som troverdig"
 msgid "checking the trust list failed: %s\n"
 msgstr "kontroll av tillitsliste mislyktes: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "sertifikatkjede er for langt\n"
@@ -8878,7 +8891,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "kontrollsum på %u bit er ugyldig for en %u-bit %s-nøkkel\n"
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
@@ -8924,42 +8937,42 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "opprettet %s, utgår %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "ingen bruksområder for nøkler valgt. Antar alle bruksområder\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "sertifikatet skulle ikke vært brukt til sertifisering\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "sertifikatet skulle ikke vært brukt til OCSP-responssignering\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "sertifikatet skulle ikke vært brukt til kryptering\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "sertifikatet skulle ikke vært brukt til signering\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "sertifikatet egner seg ikke til kryptering\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "sertifikatet egner seg ikke til signering\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9149,6 +9162,11 @@ msgstr "Vil du lage selvsignert sertifikat? (y/N) "
 msgid "These parameters are used:\n"
 msgstr "Følgende parametre brukes:\n"
 
+#: sm/certreqgen-ui.c:433
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "feil under oppretting av midlertidig fil: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr "Lager selvsignert sertifikat."
@@ -9222,123 +9240,123 @@ msgstr "sletting av sertifikat «%s» mislyktes: %s\n"
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige mottakere valgt\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "list external keys"
 msgstr "vis eksterne nøkler"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "list certificate chain"
 msgstr "vis sertifikatkjede "
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 msgid "import certificates"
 msgstr "importer sertifikater"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "export certificates"
 msgstr "eksporter sertifikater"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr "registrer smartkort"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr "send en kommando til dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr "kall gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "ikke bruk terminal i det hele tatt"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr "|N|antall sertifikater som skal være med"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr "|FIL|hent regler fra valgt FIL"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr "forvent inndata i «PEM»-format"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr "forvent inndata i «base-64»-format"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr "forvent inndata i binærformat"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 msgid "create base-64 encoded output"
 msgstr "lag base64-kodet utdata"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|BRUKER-ID|bruk valgt BRUKER-ID som forvalgt hemmelig nøkkel"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FIL|legg til nøkkelknippe i liste over nøkkelknipper"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr "hent manglende utstedersertifikat"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAVN|bruk valgt kodeNAVN til PKCS#12-passordfraser"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr "aldri spør CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr "ikke se etter rotsertifikater i CRL"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr "kontroller gyldighet med OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr "ikke kontroller sertifikatregler"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAVN|bruk valgt krypteringsalgoritme-NAVN"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAVN|bruk valgt summeringsalgoritme-NAVN for melding"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "buntmodus: aldri spør"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "svar automatisk ja på de fleste spørsmål"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "svar automatisk nei på de fleste spørsmål"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FIL|lagre en revisjonslogg i valgt FIL"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Bruk: @GPGSM@ [valg] [filer] (-h for hjelp)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9348,27 +9366,27 @@ msgstr ""
 "Signer, kontroller, krypter eller dekrypter.\n"
 "Forvalgt handling avhenger av inndata.\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Merk: det er ikke mulig å kryptere til «%s»: %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "«%s» er en ukjent kontrollmodell\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "importerer sertifikat «%s»\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "klarte ikke å signere med «%s»: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ugyldig kommando (implisitt kommando finnes ikke)\n"
@@ -9398,7 +9416,7 @@ msgstr "feil under henting av lagrede valg: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "feil under importering av sertifikat: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "feil under lesing av inndata: %s\n"
@@ -9439,7 +9457,7 @@ msgstr "det oppstod en feil under nytt søk etter sertifikat: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "feil under lagring av valg: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Feil - "
 
@@ -9814,11 +9832,6 @@ msgstr "klarte ikke å lage midlertidig hurtiglagermappe-fil «%s»: %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "feil under lukking av «%s»: %s\n"
 
-#: dirmngr/crlcache.c:948
-#, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "klarte ikke å gi «%s» det nye navnet «%s»: %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
@@ -10494,92 +10507,92 @@ msgstr "følgende feilsøkingsnivåer er gyldige: %s\n"
 msgid "usage: %s [options] "
 msgstr "bruk: %s [valg] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "kolon tillates ikke i sokkelnavn\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "henting av CRL fra «%s» mislyktes: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "behandling av CRL fra «%s» mislyktes: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: for lang linje. Hoppet over\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: oppdaget ugyldig fingeravtrykk\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: lesefeil: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: ignorerer ugyldige data ved linjeslutt\n"
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "SIGHUP mottatt. Leser inn oppsett på nytt og tømmer hurtiglagre\n"
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "SIGUSR2 mottatt. Ingen handling definert\n"
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "SIGTERM mottatt. Slår av …\n"
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "SIGTERM mottatt. %d tilkoblinger er fremdeles aktive\n"
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, c-format
 msgid "shutdown forced\n"
 msgstr "slår av under tvang\n"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "SIGINT mottatt. Slår av umiddelbart\n"
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "signal %d mottatt. Ingen handling definert\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "fikk ikke tilgang til «%s»: http-status %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "Videresendt fra adresse «%s» til «%s» (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "for mange videresendinger\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10943,57 +10956,57 @@ msgstr "sertifikatkjede er funnet i orden\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "sertifikat skulle ikke vært brukt til CRL-signering\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "stille"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr "kod utdata i heksadesimaler"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr "dekod mottatte datalinjer"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr "koble til dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 #, fuzzy
 #| msgid "connect to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "koble til dirmngr"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAVN|koble til valgt Assuan-sokkelNAVN"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADR|koble til Assuan-tjener på valgt nettADResse"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr "kjør valgt Assuan-tjener"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr "ikke bruk utvidet tilkoblingsmodus"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FIL|kjør kommandoer fra valgt FIL ved oppstart"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr "kjør /subst ved oppstart"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Bruk: @GPG@-connect-agent [vlag] (-h for hjelp)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -11001,49 +11014,49 @@ msgstr ""
 "Syntaks: @GPG@-connect-agent [valg]\n"
 "Koble til kjørende agent og send kommandoer\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "valget «%s» krever et program som argument\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "ignorerer valget «%s» pga. «%s»\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "linjemottak mislyktes: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "hoppet over for lang linje\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "linje forkortet pga. innebygget Nul-tegn\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "«%s» er en ukjent kommando\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "sending av linje mislyktes: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr "ingen dirmngr kjører i gjeldende økt\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "feil under sending av standardvalg: %s\n"
@@ -11107,12 +11120,12 @@ msgstr "Ekstern bekreftelse av komponent %s mislyktes"
 msgid "Note that group specifications are ignored\n"
 msgstr "Merk at gruppespesifikasjoner blir ignorert\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "feil under lukking av «%s»\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "feil under tolkning av «%s»\n"
@@ -11303,6 +11316,12 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "feil under skriving til midlertidig fil: %s\n"
+
+#~ msgid "run in supervised mode"
+#~ msgstr "kjør i «supervised» modus"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Navn kan ikke begynne med siffer\n"
 
@@ -11646,9 +11665,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "klarte ikke å åpne %s for skriving: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "feil under skriving til %s: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "feil under lukking av %s: %s\n"
 
diff --git a/po/pl.gmo b/po/pl.gmo
index 2ddcb43..d0e5d08 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index fbd2f57..1f57afd 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2020-11-18 17:35+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nie udało się uzyskać blokady pinentry: %s\n"
@@ -30,49 +30,49 @@ msgstr "nie udało się uzyskać blokady pinentry: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|_Anuluj"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_Tak"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_Nie"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|_Zapisz w zarządcy haseł"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Czy na pewno pokazać hasło na ekranie?"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Pokazanie hasła"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Ukrycie hasła"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -94,14 +94,14 @@ msgstr ""
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -109,7 +109,7 @@ msgstr "Hasło zbyt długie"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Jakość:"
 
@@ -119,95 +119,95 @@ msgstr "Jakość:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Jakość wpisanego wyżej tekstu.\n"
 "Kryteria jakości można uzyskać od administratora."
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "Proszę wprowadzić swój PIN, żeby odblokować klucz tajny dla tej sesji"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 "Proszę wprowadzić swoje hasło, żeby odblokować klucz tajny dla tej sesji"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Hasło:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "nie pasują - proszę spróbować jeszcze raz"
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (próba %d z %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr "Powtórzenie:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 msgid "PIN too long"
 msgstr "PIN zbyt długi"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 msgid "Passphrase too long"
 msgstr "Hasło zbyt długie"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 msgid "Invalid characters in PIN"
 msgstr "Niewłaściwy znak w PIN-ie"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr "PIN zbyt krótki"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad PIN"
 msgstr "Niepoprawny PIN"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad Passphrase"
 msgstr "Niepoprawne hasło"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Proszę ponownie wprowadzić to hasło"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, 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:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -230,24 +230,24 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "klucze ssh większe niż %d bitów nie są obsługiwane\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, 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
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, 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:2513
+#: agent/command-ssh.c:2467
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "błąd pobierania listy kart: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, 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:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Zgoda"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Odmowa"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Proszę wprowadzić hasło dla klucza ssh%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -292,87 +292,79 @@ msgstr ""
 "Proszę wprowadzić hasło do zabezpieczenia odebranego klucza tajnego%%0A   %s"
 "%%0A   %s%%0Aw miejscu przechowywania kluczy gpg-agenta"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "nie udało się utworzyć strumienia z gniazda: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Proszę włożyć kartę z numerem seryjnym"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "PIN administracyjny"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Kod resetujÄ…cy"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr "Wciśnij przycisk ACK na karcie/tokenie."
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr "Do wpisywania należy użyć klawiatury czytnika."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Powtórz ten kod resetujący"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Powtórz ten PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Powtórz ten PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Kod resetujący nie powtórzony poprawnie; spróbuj jeszcze raz"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK nie powtórzony poprawnie; spróbuj jeszcze raz"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN nie powtórzony poprawnie; spróbuj jeszcze raz"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Proszę wprowadzić PIN%s%s%s aby odblokować kartę"
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "błąd tworzenia pliku tymczasowego: %s\n"
-
-#: agent/genkey.c:150
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "błąd zapisu do pliku tymczasowego: %s\n"
+#: agent/genkey.c:154
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "błąd zapisu do %s: %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 msgid "Enter new passphrase"
 msgstr "Wprowadź nowe hasło"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "Nie wprowadzono hasła!%0APuste hasło nie jest dozwolone."
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -381,11 +373,11 @@ msgstr ""
 "Nie wprowadzono hasła - to jest ogólnie zły pomysł!%0AProszę potwierdzić, że "
 "naprawdę ma nie być żadnej ochrony tego klucza."
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr "Tak, ochrona nie jest potrzebna"
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
@@ -393,7 +385,7 @@ msgstr[0] "Hasło musi mieć co najmniej %u znak długości."
 msgstr[1] "Hasło musi mieć co najmniej %u znaki długości."
 msgstr[2] "Hasło musi mieć co najmniej %u znaków długości."
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -404,238 +396,234 @@ msgstr[1] ""
 msgstr[2] ""
 "Hasło powinno zawierać przynajmniej %u cyfr lub%%0Aznaków specjalnych."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr "Hasło nie może być znanym słowem ani pasować%%0Ado określonego wzorca."
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Ostrzeżenie: Wprowadzono hasło, które nie jest bezpieczne."
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 msgid "Take this one anyway"
 msgstr "Przyjmij je mimo to"
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Proszę wprowadzić hasło do%0Azabezpieczenia swojego nowego klucza"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 msgid "Please enter the new passphrase"
 msgstr "Proszę wprowadzić nowe hasło"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Opcje przydatne do diagnostyki"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr "uruchomienie w trybie demona (w tle)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-msgid "run in supervised mode"
-msgstr "uruchomienie w trybie dozorowanym"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr "bez odłączania od konsoli"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr "wyjście poleceń w stylu sh"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr "wyjście poleceń w stylu csh"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 msgid "|FILE|read options from FILE"
 msgstr "|PLIK|odczyt opcji z PLIKU"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr "Opcje sterujące wyjściem diagnostycznym"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "więcej komunikatów"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "mniej komunikatów"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|PLIK|zapis logów trybu serwera do PLIKU"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr "Opcje sterujÄ…ce konfiguracjÄ…"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "nieużywanie SCdaemona"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|użycie PGM jako programu SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|użycie PGM jako programu SCdaemon"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAZWA|przyjęcie poleceń poprzez NAZWĘ"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignorowanie żądań zmiany TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignorowanie żądań zmiany ekranu X"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "włączenie obsługi ssh"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|użycie ALGO do wyświetlania odcisków ssh"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "włączenie obsługi putty"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 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:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|przedawnienie pamiętanych PIN-ów po N sekundach"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|przedawnienie kluczy SSH po N sekundach"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 "|N|ustawienie maksymalnego czasu życia pamięci podręcznej PIN-ów na N sekund"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|ustawienie maksymalnego czasu życia kluczy SSH na N sekund"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr "nieużywanie pamięci PIN-ów przy podpisywaniu"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 msgid "disallow the use of an external password cache"
 msgstr "niezezwalanie na użycie zewnętrznej pamięci podręcznej haseł"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "niezezwalanie klientom na oznaczanie kluczy jako ,,zaufanych''"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 msgid "allow presetting passphrase"
 msgstr "zezwolenie na predefiniowane hasło"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr "Opcje wymuszające politykę haseł"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr "niezezwalanie na pominięcie polityki haseł"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|ustawienie minimalnej długości nowych haseł na N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|wymaganie przynajmniej N znaków niealfanumerycznych w nowym haśle"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|PLIK|sprawdzanie nowych haseł pod kątem wzorców z PLIKU"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|przedawnianie haseł po N dniach"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 msgid "do not allow the reuse of old passphrases"
 msgstr "niezezwalanie na ponowne użycie starych haseł"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Opcje sterujące bezpieczeństwem"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr "niezezwalanie wywołującym na nadpisywanie pinentry"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|użycie PGM jako programu do wprowadzania PIN-u"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|ustawienie limitu czasu Pinentry na N sekund"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "zezwolenie na pytanie o hasło poprzez Emacsa"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Błędy prosimy zgłaszać na adres <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Składnia: @GPG_AGENT@ [opcje] (-h wyświetla pomoc)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -643,131 +631,136 @@ msgstr ""
 "Składnia: @GPG_AGENT@ [opcje] [polecenie [argumenty]]\n"
 "ZarzÄ…dzanie kluczem tajnym dla @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "podano błędny poziom diagnostyki ,,%s''\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skrótów wiadomości jest niepoprawny\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją.\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "nie można utworzyć gniazda: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "nazwa gniazda ,,%s'' zbyt długa\n"
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "błąd podczas pobierania nonce z gniazda\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "błąd podczas przypisywania gniazda do ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, 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:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "nasłuchiwanie na gnieździe ,,%s''\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "nie można utworzyć katalogu ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "katalog ,,%s'' utworzony\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "stat() nie powiodło się dla ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, 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:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, 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:2747
+#: agent/gpg-agent.c:2757
 #, 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:2752
+#: agent/gpg-agent.c:2762
 #, 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:2827
+#: agent/gpg-agent.c:2837
 #, 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:2832
+#: agent/gpg-agent.c:2842
 #, 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:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, 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:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s zatrzymany\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "brak działającego gpg-agenta w tej sesji\n"
@@ -793,7 +786,7 @@ msgstr ""
 "Składnia: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA\n"
 "Utrzymuwanie pamięci haseł\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -803,7 +796,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -858,42 +851,42 @@ msgstr "anulowano\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "błąd podczas pytania o hasło: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "błąd podczas otwierania ,,%s'': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "plik ,,%s'', linia %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "instrukcja \"%s\" zignorowana w ,,%s'', w linii %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "systemowa lista zaufania ,,%s'' niedostępna\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "błędny odcisk w ,,%s'', w linii %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "nieprawidłowa flaga klucza w ,,%s'', w linii %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "błąd odczytu ,,%s'', w linii %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "błąd odczytu listy zaufanych certyfikatów głównych\n"
@@ -906,7 +899,7 @@ msgstr "błąd odczytu listy zaufanych certyfikatów głównych\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -915,11 +908,11 @@ msgstr ""
 "Czy absolutnie ufasz, że%%0A  ,,%s''%%0Apoprawnie poświadcza certyfikaty "
 "użytkowników?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 msgid "Yes"
 msgstr "Tak"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr "Nie"
@@ -932,7 +925,7 @@ msgstr "Nie"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -944,20 +937,25 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr "Akceptuj"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr "Odrzuć"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "błąd zmiany nazwy ,,%s'' na ,,%s'': %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "Uwaga: To hasło nie było nigdy zmieniane.%0AProszę zmienić je teraz."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -965,15 +963,28 @@ msgid ""
 msgstr ""
 "To hasło nie zostało zmienione%%0Aod %.4s-%.2s-%.2s. Proszę zmienić je teraz."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 msgid "Change passphrase"
 msgstr "Zmiana hasła"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr "Zmienię je później"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr "Proszę włożyć kartę z numerem seryjnym"
+
+#: 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?"
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+"Proces ssh zarządał użycia klucza%%0a  %s%%0A  (%s)%%0ACzy zezwolić na to?"
+
+#: agent/findkey.c:1741
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -981,11 +992,11 @@ msgid ""
 msgstr ""
 "Czy na pewno usunąć klucz identyfikowany przez uchwyt%%0A  %s%%0A  %%C%%0A?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 msgid "Delete key"
 msgstr "Usuń klucz"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1009,7 +1020,7 @@ msgstr "Klucz %s używa niebezpiecznego (%u-bitowego) skrótu\n"
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "skrót %zu-bitowy nie jest poprawny dla %u-bitowego klucza %s\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "sprawdzenie złożonego podpisu nie powiodło się: %s\n"
@@ -1048,7 +1059,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "błąd podczas tworzenia procesu: %s\n"
@@ -1109,12 +1120,12 @@ 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:905
+#: common/sysutils.c:880
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "oczekiwanie aż plik ,,%s'' stanie się dostępny...\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiodła się: %s\n"
@@ -1337,7 +1348,7 @@ msgid "algorithm: %s"
 msgstr "algorytm: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "nieobsługiwany algorytm: %s"
@@ -1492,7 +1503,7 @@ msgstr "konwersja z ,,%s'' do ,,%s'' niedostępna\n"
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open nie powiodło się: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "konwersja z ,,%s'' do ,,%s'' nie powiodła się: %s\n"
@@ -1531,7 +1542,7 @@ msgstr "blokada ,,%s'' nie założona: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "oczekiwanie na blokadÄ™ %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "biblioteka %s jest zbyt stara (wymagana %s, zainstalowana %s)\n"
@@ -1700,7 +1711,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "brak działającego dirmngr w tej sesji\n"
@@ -1739,7 +1750,7 @@ 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:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, c-format
 msgid "Note: %s\n"
 msgstr "Uwaga: %s\n"
@@ -1766,7 +1777,7 @@ msgstr "nie działa w trybie wsadowym\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "To polecenie jest dostępne tylko dla kart w wersji 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, 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"
@@ -1831,14 +1842,14 @@ msgstr "URL do odczytania klucza publicznego: "
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "błąd odczytu ,,%s'': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
@@ -2175,26 +2186,26 @@ msgstr "Polecenia dla administratora nie sÄ… dozwolone\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawne polecenie  (spróbuj ,,help'')\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie działa z tym poleceniem\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "nie można otworzyć ,,%s''\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie został odnaleziony: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2255,8 +2266,8 @@ msgid "subkey"
 msgstr "podklucza"
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powiódł się: %s\n"
@@ -2319,14 +2330,14 @@ msgstr "szyfr ,,%s'' nie może być używany w trybie %s\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "szyfr ,,%s'' nie może być używany w trybie %s\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2349,7 +2360,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "OSTRZEŻENIE: klucz %s nie nadaje się do szyfrowania w trybie %s\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2452,12 +2463,12 @@ msgstr "eksport kluczy tajnych nie jest dozwolony\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "klucz %s: klucz PGP 2.x - pominięty\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZEŻENIE: nic nie zostało wyeksportowane!\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, c-format
 msgid "error creating '%s': %s\n"
@@ -2523,282 +2534,282 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "poprawne argimenty dla opcji ,,%s'':\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 msgid "make a signature"
 msgstr "złożenie podpisu"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "make a clear text signature"
 msgstr "złożenie podpisu pod dokumentem"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "złożenie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domyślne)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpisów"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr "wypisanie i sprawdzenie podpisów kluczy"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisków"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "wygenerowanie nowej pary kluczy"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 msgid "quickly generate a new key pair"
 msgstr "szybkie wygenerowanie nowej pary kluczy"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "quickly add a new user-id"
 msgstr "szybkie dodanie nowego identyfikatora użytkownika"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 msgid "quickly revoke a user-id"
 msgstr "szybkie unieważnienie identyfikatora użytkownika"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly set a new expiration date"
 msgstr "szybkie ustawienie nowej daty wygaśnięcia"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr "wygenerowanie pary kluczy z pełną funkcjonalnością"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu unieważnienia klucza"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "usunięcie klucza ze zbioru kluczy publicznych"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "usunięcie klucza ze zbioru kluczy prywatnych"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "quickly sign a key"
 msgstr "szybkie złożenie podpisu na kluczu"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "quickly sign a key locally"
 msgstr "szybkie złożenie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 msgid "quickly revoke a key signature"
 msgstr "szybkie unieważnienie podpisu klucza"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "złożenie podpisu na kluczu"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "złożenie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "zmiana hasła"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "odświeżenie wszystkich kluczy z serwera"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "import/dołączenie kluczy"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr "wyświetlenie stanu karty"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr "zmiana danych na karcie"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr "zmiana PIN-u karty"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid "print message digests"
 msgstr "wypisanie skrótów wiadomości"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "uruchomienie w trybie serwera"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|WARTOŚĆ|ustawienie polityki TOFU dla klucza"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|użycie NAZWY jako domyślnego klucza tajnego"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAZWA|szyfrowanie także dla odbiorcy NAZWA"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|określ adres email"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr "ścisłe zachowanie OpenPGP"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plików"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Opcje sterujące bezpieczeństwem"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 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:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|PLIK|zapis wyjścia do PLIKU"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|ustawienie poziomu kompresji N (0 - bez)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 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:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 "|MECHANIZMY|wykorzystaj MECHANIZMY do wyszukiwania kluczy na podstawie "
 "adresów e-mail"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 msgid "import missing key from a signature"
 msgstr "import brakujÄ…cego klucza z podpisu"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 msgid "include the public key in signatures"
 msgstr "włączanie klucza publicznego do podpisów"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "zablokuj dostęp do dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "Opcje sterujÄ…ce konfiguracjÄ…"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|UŻYTKOWNIK|szyfrowanie dla odbiorcy o tym identyfikatorze"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "|UŻYTKOWNIK|użycie tego identyfikatora użytkownika do podpisania lub "
 "odszyfrowania"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2806,7 +2817,7 @@ msgstr ""
 "@\n"
 "(Pełną listę poleceń i opcji można znaleźć w podręczniku systemowym.)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2828,11 +2839,11 @@ msgstr ""
 " --list-keys [nazwy]        pokazanie kluczy\n"
 " --fingerprint [nazwy]      pokazanie odcisków kluczy\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Składnia: @GPG@ [opcje] [pliki] (-h wyświetla pomoc)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2842,7 +2853,7 @@ msgstr ""
 "Podpisywanie, sprawdzanie podpisów, szyfrowanie, rozszyfrowywanie\n"
 "Domyślnie wykonywana operacja zależy od danych wejściowych\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2850,78 +2861,78 @@ msgstr ""
 "\n"
 "Obsługiwane algorytmy:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Skrótów: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "składnia: %s [opcje] %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu domowego ,,%s''\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa własności do pliku konfiguracyjnego ,,%s''\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "OSTRZEŻENIE: niebezpieczne prawa własności do rozszerzenia ,,%s''\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu domowego ,,%s''\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa dostępu do pliku konfiguracyjnego ,,%s''\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "OSTRZEŻENIE: niebezpieczne prawa dostępu do rozszerzenia ,,%s''\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego katalog "
 "domowy ,,%s''\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2929,21 +2940,21 @@ msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego plik "
 "konfiguracyjny ,,%s''\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa własności do katalogu zawierającego "
 "rozszerzenie ,,%s''\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego katalog "
 "domowy ,,%s''\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2951,480 +2962,480 @@ msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego plik "
 "konfiguracyjny ,,%s''\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "OSTRZEŻENIE: niebezpieczne prawa dostępu do katalogu zawierającego "
 "rozszerzenie ,,%s''\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr "wyświetlenie ID zdjęć przy wypisywaniu kluczy"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 msgid "show key usage information during key listings"
 msgstr "pokazywanie informacji o zastosowaniu klucza przy wypisywaniu kluczy"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr "pokazywanie URL-i polityk przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 msgid "show all notations during signature listings"
 msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr "pokazywanie adnotacji użytkownika przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "pokazywanie URL-i preferowanych serwerów kluczy przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr "pokazywanie poprawności ID użytkownika przy wypisywaniu kluczy"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "pokazywanie unieważnionych i wygasłych ID użytkownika na listach kluczy"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr "pokazywanie unieważnionych i wygasłych podkluczy na listach kluczy"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 msgid "show the keyring name in key listings"
 msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 msgid "show expiration dates during signature listings"
 msgstr "pokazywanie dat wygaśnięcia przy wypisywaniu podpisów"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "nieznana polityka TOFU ,,%s''\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(,,help'' wyświetli listę wyborów)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "To polecenie nie jest dostępne w trybie %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Uwaga: %s nie jest do normalnego użytku!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr ",,%s'' nie jest poprawnym czasem wygaśnięcia podpisu\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr ",,%s'' nie jest niepoprawnym adresem e-mail\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "błędny tryb pinentry ,,%s''\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "błędne źródło żądania ,,%s''\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr ",,%s'' nie jest poprawną nazwą zestawu znaków\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozumiały URL serwera kluczy\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "niepoprawne opcje filtrowania: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr "wyświetlanie ID zdjęć przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 msgid "show all notations during signature verification"
 msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr "pokazywanie adnotacji użytkownika przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "pokazywanie URL-i preferowanych serwerów kluczy przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 msgid "show user ID validity during signature verification"
 msgstr "pokazywanie poprawności ID użytkownika przy sprawdzaniu podpisów"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "pokazywanie unieważnionych i wygasłych ID użytkownika przy sprawdzaniu "
 "podpisów"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 msgid "show only the primary user ID in signature verification"
 msgstr "pokazywanie tylko głównego ID użytkownika przy sprawdzaniu podpisu"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nie można ustawić ścieżki programów wykonywalnych na %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "Niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "błędny argument dla opcji ,,%.50s''\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZEŻENIE: program może stworzyć plik zrzutu pamięci!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZEŻENIE: %s powoduje obejście %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno używać %s z %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w połączeniu z %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "OSTRZEŻENIE: działanie z fałszywym czasem systemowym: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nie zadziała z niebezpieczną pamięcią z powodu %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfrujÄ…cy jest niepoprawny\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "wybrany algorytm skrótów wiadomości jest niepoprawny\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm kompresji jest niepoprawny\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skrótów poświadczeń jest niepoprawny\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "wartość completes-needed musi być większa od 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "wartość marginals-needed musi być większa od 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "wartość max-cert-depth musi mieścić się w zakresie od 1 do 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "niewłaściwy domyślny poziom sprawdzania; musi mieć wartość 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "niewłaściwy minimalny poziom sprawdzania; musi mieć wartość 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Uwaga: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mieć wartość 0, 1 lub 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "niewłaściwe domyślne ustawienia\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "niewłaściwe ustawienia szyfrów\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "niewłaściwe ustawienia szyfrów\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "niewłaściwe ustawienia skrótów\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "niewłaściwe ustawienia algorytmów kompresji\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "niewłaściwa długość klucza; wykorzystano %u bitów\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie działa z %s!\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 #| msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "szyfr ,,%s'' nie może być używany w trybie %s\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "algorytm kompresji ,,%s'' nie może być używany w trybie %s\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiodło się: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "OSTRZEŻENIE: podano adresatów (-r) w działaniu które ich nie dotyczy\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "szyfrowanie symetryczne ,,%s'' nie powiodło się: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nie można użyć --symmetric --encrypt wraz z --s2k-mode 0\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "nie można użyć --symmetric --encrypt w trybie %s\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nie można użyć --symmetric --sign --encrypt wraz z --s2k-mode 0\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "nie można użyć --symmetric --sign --encrypt w trybie %s\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysyłka do serwera kluczy nie powiodła się: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbiór z serwera kluczy nie powiódł się: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powiódł się: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "eksport do klucza ssh powiódł się: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiodło się: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "odświeżenie kluczy z serwera nie powiodło się: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdjęcie opakowania ASCII nie powiodło się: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiodło się: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "niewłaściwy algorytm skrótu ,,%s''\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "błąd analizy specyfikacji klucza ,,%s'': %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 ",,%s'' nie wygląda na prawidłowy identyfikator, odcisk ani uchwyt klucza\n"
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "OSTRZEŻENIE: nie podano polecenia. Próba odgadnięcia zamiaru...\n"
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoją wiadomość ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu poświadczania jest niepoprawny\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpisów jest niepoprawny\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
@@ -3437,7 +3448,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|pisanie opisu stanu do deskryptora FD"
 
@@ -4169,7 +4180,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisać? (t/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr " Nie da się złożyć podpisu.\n"
 
@@ -4347,8 +4358,8 @@ msgstr "Tożsamość użytkownika została dokładnie sprawdzona.\n"
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisać? (t/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "złożenie podpisu nie powiodło się: %s\n"
@@ -4556,7 +4567,7 @@ msgstr ""
 "(ltsign,\n"
 "  tnrsign itd.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "Klucz unieważniony."
 
@@ -4606,7 +4617,7 @@ msgstr "Czy na pewno usunąć ten identyfikator użytkownika? (t/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Czy na pewno przenieść główny klucz (t/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr "Musisz wybrać dokładnie jeden klucz.\n"
 
@@ -4684,161 +4695,161 @@ msgstr "Zapisać zmiany? (t/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Wyjść bez zapisania zmian? (t/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Klucz nie został zmieniony więc zapis zmian nie jest konieczny.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "nie można unieważnić ostatniego identyfikatora użytkownika.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "unieważnienie identyfikatora użytkownika nie powiodło się: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "ustawienie głównego identyfikatora użytkownika nie powiodło się: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr ",,%s'' nie jest odciskiem\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr ",,%s'' nie jest głównym odciskiem\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "Błędny identyfikator użytkownika ,,%s'': %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "No matching user IDs."
 msgstr "Brak pasującego identyfikatora użytkownika."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "Nothing to sign.\n"
 msgstr "Nie ma nic do podpisania.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Nie podpisane przez ciebie.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "unieważnienie podpisu klucza nie powiodło się: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr ",,%s'' nie jest poprawnym czasem wygaśnięcia\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr ",,%s'' nie jest właściwym odciskiem\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "podklucz ,,%s'' nie został odnaleziony\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr "AEAD: "
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Skrót: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr "no-modify dla serwera kluczy"
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr "Preferowany serwer kluczy: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 msgid "Notations: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Klucze PGP 2.x nie zawierają opisu ustawień.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Ten klucz został unieważniony %s przez klucz użytkownika %s %s\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Klucz może zostać unieważniony przez klucz %s użytkownika %s"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr "(poufne)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "utworzono: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr "unieważniono: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr "wygasł: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "wygasa: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr "użycie: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr "nr-karty: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr "zaufanie: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr "poprawność: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Ten klucz został wyłączony z użytku"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4846,17 +4857,17 @@ msgstr ""
 "Pokazana wartość wiarygodności klucza może być niepoprawna,\n"
 "dopóki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr "unieważniony"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "wygasł"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4866,17 +4877,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:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "OSTRZEŻENIE: podklucz do szyfrowania wkrótce wygaśnie.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Może warto także zmienić jego datę ważności.\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4885,35 +4896,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je dodać? (t/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie można dodać zdjęcia.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "Taki identyfikator użytkownika już istnieje na tym kluczu!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usunąć ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usunąć ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usunąć ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usunąć ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4921,20 +4934,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:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zostało usunięte.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "niepoprawny"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Identyfikator użytkownika ,,%s'' upakowany: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4942,17 +4955,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:4467
+#: g10/keyedit.c:4523
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Identyfikator użytkownika ,,%s'': już zmniejszony.\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Identyfikator użytkownika ,,%s'': już czysty.\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4962,215 +4975,215 @@ msgstr ""
 "             unieważniającego spowoduje, że niektóre wersje PGP przestaną\n"
 "             go rozumieć.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie można wyznaczyć klucza unieważniającego.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza unieważniającego: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "klucza PGP 2.x nie można wyznaczyć jako unieważniającego\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nie można wyznaczyć klucza do unieważniania jego samego\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "ten klucz został już uznany kluczem unieważniającym\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "OSTRZEŻENIE: nie można cofnąć wyznaczenia klucza jako unieważniającego!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Czy na pewno chcesz wyznaczyć ten klucz jako unieważniający? (t/N) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "Czy na pewno zmienić datę ważności dla wielu podkluczy? (t/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty ważności podklucza.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty ważności głównego klucza.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nie można zmienić daty ważności klucza w wersji 3.\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 msgid "Changing usage of a subkey.\n"
 msgstr "Zmiana zastosowań podklucza.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 msgid "Changing usage of the primary key.\n"
 msgstr "Zmiana zastosowań klucza głównego.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "podklucz podpisujący %s jest już skrośnie podpisany\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "podklucz %s nie jest podpisujący, więc nie musi być skrośnie podpisany\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Proszę wybrać dokładnie jeden identyfikator użytkownika.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pominięty\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr "Podaj preferowany URL serwera kluczy: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz go zastąpić? (t/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz go usunąć? (t/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 msgid "Enter the notation: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 msgid "Proceed? (y/N) "
 msgstr "Kontynuować? (t/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora użytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora użytkownika o skrócie %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Brak podklucza o identyfikatorze ,,%s''.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak podklucza o numerze %d.\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "identyfikator użytkownika: ,,%s''\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podpisany twoim kluczem %s w %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ważność tego klucza wygasła %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go unieważnić? (t/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzyć certyfikat unieważnienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te identyfikatory na kluczu %s sÄ… podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr " (podpis nieunieważnialny) "
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "unieważniony przez twój klucz %s w %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz unieważnić te podpisy:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzyć certyfikaty unieważnienia ? (t/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 "próba unieważnienia identyfikatora nie odnoszącego się do użytkownika: %s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator użytkownika ,,%s'' został już unieważniony\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "OSTRZEŻENIE: identyfikator użytkownika podpisany za %d sekund (w "
 "przyszłości)\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr ""
 "Nie można unieważnić ostatniego poprawnego identyfikatora użytkownika.\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klucz %s jest już unieważniony.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklucz %s jest już unieważniony.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5602,6 +5615,10 @@ msgstr ""
 "Nie należy umieszczać adresu poczty elektronicznej w polu nazwiska czy\n"
 "komentarza.\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Taki identyfikator użytkownika już istnieje na tym kluczu!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5936,7 +5953,7 @@ msgstr "niepoprawny protokół serwera kluczy (nasz %d != moduł obsługi %d)\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ",,%s'' nie jest identyfikatorem klucza - pominięto\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5944,47 +5961,47 @@ msgstr[0] "odświeżanie %d klucza z %s\n"
 msgstr[1] "odświeżanie %d kluczy z %s\n"
 msgstr[2] "odświeżanie %d kluczy z %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "OSTRZEŻENIE: nie można odświeżyć klucza %s przez %s: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "klucz ,,%s'' nie został odnaleziony na serwerze kluczy\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "klucz nie został odnaleziony na serwerze kluczy\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "zapytanie o klucz %s z %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "brak znanego serwera kluczy\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "pominięty ,,%s'': %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "wysyłanie klucza %s na %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "zapytanie o klucz z ,,%s''\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "OSTRZEŻENIE: nie można pobrać URI %s: %s\n"
@@ -6017,69 +6034,69 @@ msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "hasło wygenerowane nieznanym algorytmem skrótu %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr "klucz publiczny to %s\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr ""
 "zaszyfrowano %u-bitowym kluczem %s o identyfikatorze %s, stworzonym %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      ,,%s''\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zaszyfrowano kluczem %s o identyfikatorze %s\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "OSTRZEŻENIE: widziano wiele czystych tekstów\n"
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zaszyfrowane za pomocą %lu haseł\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "zaszyfrowane jednym hasłem\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "błąd odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "przyjmując że dane zostały zaszyfrowane za pomocą %s\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "szyfr IDEA nie jest dostępny, próba użycia %s zamiast niego\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "OSTRZEŻENIE: wiadomość nie była zabezpieczona przed manipulacją\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -6089,182 +6106,182 @@ msgstr ""
 "prawdopodobne, że jest ona prawdziwa. Jest tak dlatego, że w tamtych\n"
 "czasach ochrona integralności nie była szeroko stosowana.\n"
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Użycie mimo to opcji ,,%s'' do odszyfrowania.\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "wymuszono błąd odszyfrowywania!\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "odszyfrowanie poprawne\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZEŻENIE: zaszyfrowana wiadomość była manipulowana!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "błąd odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Uwaga: nadawca zaznaczył, że wiadomość nie powinna być zapisywana\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "osobny certyfikat unieważnienia - użyj ,,gpg --import'' aby go wczytać\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, c-format
 msgid "no signature found\n"
 msgstr "nie znaleziono podpisu\n"
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis złożony przez ,,%s''"
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Przeterminowany podpis złożony przez ,,%s''"
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis złożony przez ,,%s''"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pominięcie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nie można obsłużyć tych wieloznacznych danych podpisu\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpisano w %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               przy użyciu klucza %s %s\n"
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpisano w %s kluczem %s o numerze %s\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                        wystawca ,,%s''\n"
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Klucz dostępny w: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "Uwaga: aby wykorzystać tę informację, należy użyć ,,%s''\n"
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                        alias ,,%s''"
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "OSTRZEŻENIE: ten klucz nie nadaje się do podpisywania w trybie %s\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Ważność podpisu wygasła %s.\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Ważność podpisu wygasa %s.\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "podpis %s, algorytm skrótu %s%s%s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "binarny"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "nieznany"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 msgid ", key algorithm "
 msgstr ", algorytm klucza "
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 "OSTRZEŻENIE: to nie jest oddzielony podpis; plik ,,%s'' NIE został "
 "zweryfikowany!\n"
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie można sprawdzić podpisu: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "OSTRZEŻENIE: wielokrotne podpisy. Tylko pierwszy zostanie sprawdzony.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
@@ -6338,11 +6355,6 @@ msgstr "(dalsze informacje: "
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: przestarzała opcja ,,%s''\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "OSTRZEŻENIE: ,,%s'' jest przestarzałą opcją.\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7440,133 +7452,133 @@ msgstr "błąd odczytu w ,,%s'': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "baza zaufania: synchronizacja nie powiodła się %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "nie można utworzyć blokady dla ,,%s''\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "nie można zablokować ,,%s''\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "baza zaufania, wpis %lu: funkcja lseek() nie powiodła się: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "baza zaufania, wpis %lu: zapis nie powiódł się (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "zbyt duże zlecenie dla bazy zaufania\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "nie można dostać się do ,,%s'': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: stworzenie zapisu o wersji nie powiodło się: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: stworzony niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: baza zaufania utworzona\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Uwaga: nie można zapisywać bazy zaufania\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: tworzenie tablicy skrótów nie powiodło się: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: błąd przy uaktualnianiu numeru wersji: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: błąd odczytu numeru wersji: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: błąd zapisu numeru wersji: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "baza zaufania: funkcja lseek() zawiodła: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "baza zaufania: funkcja read() (n=%d) zawiodła: %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: to nie jest plik bazy zaufania\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: wpis wersji z numerem %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: niewłaściwa wersja pliku %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: błąd odczytu pustego wpisu: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: błąd zapisu wpisu katalogowego: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: zerowanie rekordu nie powiodło się: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: dopisanie rekordu nie powiodło się: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "BÅ‚Ä…d: uszkodzona baza zaufania.\n"
@@ -8228,16 +8240,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%sNumer: %s%%0AWłaściciel: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "Pozostało prób: %d"
@@ -8278,10 +8290,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Zapytanie zwrotne o PIN zwróciło błąd: %s\n"
@@ -8303,57 +8315,57 @@ msgstr "PIN dla CHV%d jest zbyt krótki; minimalna długość to %d\n"
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr "klucz już istnieje\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "istniejÄ…cy klucz zostanie zastÄ…piony\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr "generowanie nowego klucza\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, c-format
 msgid "writing new key\n"
 msgstr "zapisywanie nowego klucza\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nie powiódł się zapis klucza: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpowiedź nie zawiera współczynnika RSA\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpowiedź nie zawiera publicznego wykładnika RSA\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "odpowiedź nie zawiera klucza publicznego EC\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "proszę czekać na wygenerowanie klucza...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr "generowanie klucza nie powiodło się\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8361,67 +8373,67 @@ msgstr[0] "generowanie klucza zakończone (%d sekunda)\n"
 msgstr[1] "generowanie klucza zakończone (%d sekundy)\n"
 msgstr[2] "generowanie klucza zakończone (%d sekund)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "odpowiedź nie zawiera danych klucza publicznego\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 "||Proszę wprowadzić PIN PIN dla klucza do tworzenia podpisów kwalifikowanych."
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Proszę wprowadzić PIN administracyjny"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Proszę wprowadzić kod odblokowujący PIN (PUK) dla zwykłych kluczy."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Proszę wprowadzić PIN dla zwykłych kluczy."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "reszta RSA brakująca lub o rozmiarze innym niż %d bity\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "publiczny wykładnik RSA brakujący lub większy niż %d bity\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "NullPIN nie został jeszcze zmieniony\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN nie został jeszcze zmieniony\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Proszę wprowadzić nowy PIN dla zwykłych kluczy."
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|NP|Proszę wprowadzić nowy kod oblokowujący PIN (PUK) dla zwykłych kluczy."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 "|N|Proszę wprowadzić nowy PIN dla klucza do tworzenia podpisów "
 "kwalifikowanych."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8429,7 +8441,7 @@ msgstr ""
 "|NP|Proszę wprowadzić nowy kod odblokowujący PIN (PUK) dla klucza do "
 "tworzenia podpisów kwalifikowanych."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8437,27 +8449,27 @@ msgstr ""
 "|P|Proszę wprowadzić kod odblokowujący PIN (PUK) dla klucza do tworzenia "
 "podpisów kwalifikowanych."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "błąd podczas odczytu nowego PIN-u: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "nie powiódł się zapis odcisku: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "nie powiódł się zapis daty utworzenia: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "błąd podczas odczytu stanu CHV z karty\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "odczyt klucza publicznego nie powiódł się: %s\n"
@@ -8465,44 +8477,44 @@ msgstr "odczyt klucza publicznego nie powiódł się: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%sNumer: %s%%0AWłaściciel: %s%%0ALicznik: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "użycie domyślnego PIN-u jako %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "nie udało się użyć domyślnego PIN-u jako %s: %s - wyłączenie dalszego "
 "domyślnego użycia\n"
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 msgid "||Please unlock the card"
 msgstr "||Proszę odblokować kartę"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN dla CHV%d jest zbyt krótki; minimalna długość to %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "weryfikacja CHV%d nie powiodła się: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "karta została trwale zablokowana!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8514,20 +8526,20 @@ msgstr[1] ""
 msgstr[2] ""
 "Zostało %d prób PIN-u administracyjnego do trwałego zablokowania karty\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "dostęp do poleceń administratora nie został skonfigurowany\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 msgid "||Please enter the PIN"
 msgstr "||Proszę wpisać PIN"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Proszę wprowadzić kod resetujący dla karty"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Kod resetujący zbyt krótki; minimalna długość to %d\n"
@@ -8535,72 +8547,72 @@ msgstr "Kod resetujący zbyt krótki; minimalna długość to %d\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr "|RN|Nowy kod resetujÄ…cy"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nowy PIN administracyjny"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr "|N|Nowy PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Proszę wprowadzić PIN administracyjny i nowy PIN administracyjny"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Proszę wprowadzić PIN i nowy PIN"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr "błąd podczas odczytu danych aplikacji\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "błąd podczas odczytu odcisku DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "brak datownika utworzenia\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "liczba pierwsza %s RSA brakująca lub o rozmiarze innym niż %d bitów\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, c-format
 msgid "unsupported curve\n"
 msgstr "nieobsługiwana krzywa\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "niepoprawna struktura karty OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "odcisk na karcie nie zgadza się z żądanym\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "karta nie obsługuje algorytmu skrótu %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dotychczas stworzono podpisów: %lu\n"
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -8608,7 +8620,7 @@ msgstr ""
 "weryfikacja PIN-u administracyjnego tym poleceniem jest aktualnie "
 "zabroniona\n"
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie można dostać się do %s - niepoprawna karta OpenPGP?\n"
@@ -8628,7 +8640,7 @@ msgstr "|N|PoczÄ…tkowy nowy PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
 
@@ -8672,11 +8684,11 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "zabronienie używania poleceń karty administratora"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Składnia: @SCDAEMON@ [opcje] (-h wyświetla pomoc)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8684,22 +8696,22 @@ msgstr ""
 "Składnia: scdaemon [opcje] [polecenie [argumenty]]\n"
 "Demon kart procesorowych dla @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "proszę użyć opcji ,,--daemon'' do uruchomienia programu w tle\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "obsługa fd %d uruchomiona\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "obsługa fd %d zakończona\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -8927,7 +8939,7 @@ msgstr "główny certyfikat nie jest oznaczony jako zaufany"
 msgid "checking the trust list failed: %s\n"
 msgstr "sprawdzenie listy zaufania nie powiodło się: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "łańcuch certyfikatów zbyt długi\n"
@@ -8982,7 +8994,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "skrót %u-bitowy nie jest poprawny dla %u-bitowego klucza %s\n"
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
@@ -9027,42 +9039,42 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "stworzony %s, wygasa %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "nie podano zastosowania klucza - przyjęto wszystkie zastosowania\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "certyfikat nie powinien być używany do poświadczania\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certyfikat nie powinien być używany do podpisywania odpowiedzi OCSP\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "certyfikat nie powinien być używany do szyfrowania\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "certyfikat nie powinien być używany do podpisywania\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certyfikat nie nadaje siÄ™ do szyfrowania\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certyfikat nie nadaje siÄ™ do podpisywania\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9251,6 +9263,11 @@ msgstr "Stworzyć własnoręcznie podpisany certyfikat? (t/N) "
 msgid "These parameters are used:\n"
 msgstr "Użyte będą następujące parametry:\n"
 
+#: sm/certreqgen-ui.c:433
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "błąd tworzenia pliku tymczasowego: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr "Tworzenie własnoręcznie podpisanego certyfikatu. "
@@ -9323,123 +9340,123 @@ msgstr "usunięcie certyfikatu ,,%s'' nie powiodło się: %s\n"
 msgid "no valid recipients given\n"
 msgstr "nie podano poprawnych adresatów\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "list external keys"
 msgstr "wypisanie kluczy zewnętrznych"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "list certificate chain"
 msgstr "wypisanie łańcucha certyfikatów"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 msgid "import certificates"
 msgstr "import certyfikatów"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "export certificates"
 msgstr "eksport certyfikatów"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr "zarejestrowanie karty procesorowej"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr "przekazanie polecenia do dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr "wywołanie gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "nieużywanie w ogóle terminala"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr "|N|liczba certyfikatów do dołączenia"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr "|PLIK|pobranie informacji o polityce z PLIKU"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr "przyjęcie wejścia w formacie PEM"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr "przyjęcie wejścia w formacie base-64"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr "przyjęcie wejścia w formacie binarnym"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 msgid "create base-64 encoded output"
 msgstr "tworzenie wyjścia zakodowanego base-64"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|UŻYTKOWNIK|użycie tego identyfikatora jako domyślnego klucza tajnego"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|PLIK|dodanie tego zbioru kluczy do listy zbiorów kluczy"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr "pobranie brakujących certyfikatów wystawców"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAZWA|użycie kodowania NAZWA dla haseł PKCS#12"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr "pominięcie CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr "niesprawdzanie CRL dla głównych certyfikatów"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr "sprawdzenie poprawności przy użyciu OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr "niesprawdzanie polityk certyfikatów"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|użycie tego algorytmu szyfrowania NAZWA"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|użycie tego algorytmu skrótu wiadomości"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: bez żadnych pytań"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "przyjęcie odpowiedzi ,,tak'' na większość pytań"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "przyjęcie odpowiedzi ,,nie'' na większość pytań"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 msgid "|FILE|write an audit log to FILE"
 msgstr "|PLIK|zapisanie logów audytowych do PLIKU"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Składnia: @GPGSM@ [opcje] [pliki] (-h wyświetla pomoc)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9450,27 +9467,27 @@ msgstr ""
 "S/MIME\n"
 "Domyślnie wykonywana operacja zależy od danych wejściowych\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Uwaga: nie można zaszyfrować do ,,%s'': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "nieznany model poprawności ,,%s''\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "import wspólnych certyfikatów ,,%s''\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nie można podpisać z użyciem ,,%s'': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "błędne polecenie (nie ma polecenia domyślnego)\n"
@@ -9501,7 +9518,7 @@ msgstr "błąd pobierania zapisanych flag: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "błąd importu certyfikatu: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "błąd odczytu wejścia: %s\n"
@@ -9542,7 +9559,7 @@ msgstr "problem z ponownym odszukaniem certyfikatu: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "błąd zapisywania flag: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "BÅ‚Ä…d - "
 
@@ -9922,11 +9939,6 @@ msgstr ""
 msgid "error closing '%s': %s\n"
 msgstr "błąd zamykania ,,%s'': %s\n"
 
-#: dirmngr/crlcache.c:948
-#, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "błąd zmiany nazwy ,,%s'' na ,,%s'': %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
@@ -10612,93 +10624,93 @@ msgstr "poprawne poziomy diagnostyki to: %s\n"
 msgid "usage: %s [options] "
 msgstr "składnia: %s [opcje]"
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "dwukropki nie sÄ… dozwolone w nazwie gniazda\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "pobranie CRL z ,,%s'' nie powiodło się: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "przetworzenie CRL z ,,%s'' nie powiodło się: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: linia zbyt długa - pominięto\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: wykryto błędny odcisk\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: błąd odczytu: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: zignorowano śmieci na końcu linii\n"
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 "otrzymano SIGHUP - ponowny odczyt konfiguracji i zapis pamięci podręcznej\n"
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "otrzymano SIGUSR2 - nie zdefiniowano akcji\n"
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "otrzymano SIGTERM - zamykanie...\n"
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "otrzymano SIGTERM - nadal są aktywne połączenia: %d\n"
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, c-format
 msgid "shutdown forced\n"
 msgstr "wymuszono zamknięcie\n"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "otrzymano SIGINT - natychmiastowe zamknięcie\n"
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "otrzymano sygnał %d - nie zdefiniowano akcji\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "błąd dostępu do ,,%s'': status http %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL ,,%s'' przekierowany na ,,%s'' (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "za dużo przekierowań\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "przekierowanie zmienione na ,,%s''\n"
@@ -11062,57 +11074,57 @@ msgstr "łańcuch certyfikatów jest dobry\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certyfikat nie powinien być używany do podpisywania CRL\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "cicho"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr "wypisanie danych zakodowanych szesnastkowo"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr "dekodowanie otrzymanych linii danych"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr "połączenie z dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 #, fuzzy
 #| msgid "connect to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "połączenie z dirmngr"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAZWA|połączenie z gniazdem Assuan o tej nazwie"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADRES|połączenie z serwerem Assuan pod ADRESEM"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr "uruchomienie serwera Assuan podanego z linii poleceń"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr "nieużywanie rozszerzonego trybu połączenia"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|PLIK|uruchomienie poleceń z PLIKU przy starcie"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr "uruchomienie /subst przy starcie"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Składnia: @GPG@-connect-agent [opcje] (-h wyświetla pomoc)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -11120,49 +11132,49 @@ msgstr ""
 "Składnia: @GPG@-connect-agent [opcje]\n"
 "Połączenie z działającym agentem i wysyłanie poleceń\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "opcja ,,%s'' wymaga programu i opcjonalnych argumentów\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "opcja ,,%s'' zignorowana z powodu ,,%s''\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "odbieranie linii nie powiodło się: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "linia zbyt długa - pominięta\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "linia skrócona z powodu osadzonego znaku Nul\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "nieznane polecenie ,,%s''\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "wysyłanie linii nie powiodło się: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr "brak działającego dirmngr w tej sesji\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "błąd wysyłania standardowych opcji: %s\n"
@@ -11224,12 +11236,12 @@ msgstr "Zewnętrzna weryfikacja komponentu %s nie powiodła się"
 msgid "Note that group specifications are ignored\n"
 msgstr "Uwaga, określenia grup są ignorowane\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "błąd zamykania ,,%s''\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "błąd analizy ,,%s''\n"
@@ -11419,6 +11431,12 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "błąd zapisu do pliku tymczasowego: %s\n"
+
+#~ msgid "run in supervised mode"
+#~ msgstr "uruchomienie w trybie dozorowanym"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Imię lub nazwisko nie może zaczynać się od cyfry\n"
 
@@ -11755,9 +11773,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "nie udało się otworzyć %s do zapisu: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "błąd zapisu do %s: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "błąd zamykania %s: %s\n"
 
diff --git a/po/pt.po b/po/pt.po
index 39837bd..b75f122 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2015-02-11 19:17+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
@@ -29,52 +29,52 @@ msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Você quer realmente remover as chaves selecionadas? "
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "frase-secreta inválida"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -85,28 +85,28 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "frase secreta demasiado longa\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -116,107 +116,107 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorrecta"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "PIN too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inválido no nome\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorrecta"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/command.c:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -228,9 +228,9 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritmo de protecção %d%s não é suportado\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
@@ -238,15 +238,15 @@ msgstr "impossível criar `%s': %s\n"
 
 #: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -257,137 +257,128 @@ 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:2513
+#: agent/command-ssh.c:2467
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: falha ao criar tabela de dispersão: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Repita a frase secreta: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Repita a frase secreta: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repita a frase secreta: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "a frase secreta não foi repetida corretamente; tente outra vez"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "erro na criação da frase secreta: %s\n"
-
-#: agent/genkey.c:150
+#: agent/genkey.c:154
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "a escrever para `%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Insira a frase secreta\n"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -395,7 +386,7 @@ msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "O nome deve ter pelo menos 5 caracteres\n"
 msgstr[1] "O nome deve ter pelo menos 5 caracteres\n"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -403,108 +394,102 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Usar esta chave de qualquer modo? "
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Você precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "A chave foi substituída"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizar a base de dados de confiança"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
@@ -512,278 +497,283 @@ msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "não suportado"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "não suportado"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|usar mode de frase secreta N"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "utilizar o gpg-agent"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado é inválido\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "a ler opções de `%s'\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AVISO: \"%s\" é uma opção depreciada\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossível criar %s: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, 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:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, 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:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, fuzzy, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, 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:2385
+#: agent/gpg-agent.c:2395
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: impossível criar directoria: %s\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2832
+#: agent/gpg-agent.c:2842
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignorado: %s\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "o gpg-agent não está disponível nesta sessão\n"
@@ -809,7 +799,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -819,7 +809,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -873,42 +863,42 @@ msgstr "cancelado pelo utilizador\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "armadura: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "partes da chave secreta não disponíveis\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "armadura: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -921,19 +911,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -946,7 +936,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -956,48 +946,63 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "erro na leitura de `%s': %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 #, fuzzy
 msgid "Change passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1231
+#, c-format
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1741
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Você quer realmente remover as chaves selecionadas? "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 #, fuzzy
 msgid "Delete key"
 msgstr "activa uma chave"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1019,7 +1024,7 @@ msgstr ""
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
@@ -1061,7 +1066,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -1123,12 +1128,12 @@ 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:905
+#: common/sysutils.c:880
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "actualização falhou: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
@@ -1357,7 +1362,7 @@ msgid "algorithm: %s"
 msgstr "armadura: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1528,7 +1533,7 @@ msgstr "criação de armadura falhou: %s\n"
 msgid "iconv_open failed: %s\n"
 msgstr "impossível abrir %s: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
@@ -1567,7 +1572,7 @@ msgstr "chave pública %08lX não encontrada: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1741,7 +1746,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "o gpg-agent não está disponível nesta sessão\n"
@@ -1784,7 +1789,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1812,7 +1817,7 @@ msgstr "impossível fazer isso em modo não-interativo\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Este comando não é permitido no modo %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "partes da chave secreta não disponíveis\n"
@@ -1879,15 +1884,15 @@ msgstr "a escrever chave pública para `%s'\n"
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
@@ -2235,27 +2240,27 @@ msgstr "a escrever chave privada para `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inválido (tente \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output não funciona para este comando\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "impossível abrir `%s'\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2318,8 +2323,8 @@ msgid "subkey"
 msgstr "Chave pública: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualização falhou: %s\n"
@@ -2381,14 +2386,14 @@ msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2411,7 +2416,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVISO: \"%s\" é uma opção depreciada\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2523,12 +2528,12 @@ msgstr "a escrever chave privada para `%s'\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "chave %08lX: tipo PGP 2.x - ignorada\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, fuzzy, c-format
 #| msgid "error creating `%s': %s\n"
@@ -2597,301 +2602,301 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 #, fuzzy
 msgid "make a signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra simétrica"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "decifrar dados (acção por omissão)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impressões digitais"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revogação"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves público"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confiança"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omissão"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "não fazer alterações"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrepôr"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "criar saída com armadura ascii"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 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:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "usar modo de texto canônico"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 "|N|estabelecer nível de compressão N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2899,7 +2904,7 @@ msgstr ""
 "@\n"
 "(Veja a página man para uma lista completa de comandos e opções)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2929,13 +2934,13 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impressões digitais\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2950,7 +2955,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a operação por omissão depende dos dados de entrada\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2958,570 +2963,570 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Chave pública: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Dispersão: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Compressão: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "uso: gpg [opções] "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "nenhum sinal = encontrada na definição de grupo \"%s\"\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "AVISO: permissões pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "criado um novo ficheiro de configuração `%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de política de assinatura dada é inválida\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave está"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Este comando não é permitido no modo %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "NOTA: %s não é para uso normal!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Endereço eletrónico inválido\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 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:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 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:3314
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "não consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opções de importação inválidas\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opções de importação inválidas\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de política de assinatura dada é inválida\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "não foi possível alterar o exec-path para %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opções de exportação inválidas\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opções de importação inválidas\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrepõe %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado é inválido\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado é inválido\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado é inválido\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certificação selecionado é inválido\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, fuzzy, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nível de verificação por omissão inválido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, fuzzy, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nível de verificação por omissão inválido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) não é recomendável\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inválido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferências por omissão inválidas\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferências pessoais de cifra inválidas\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "preferências pessoais de cifra inválidas\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferências pessoais de 'digest' inválidas\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferências pessoais de compressão inválidas\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "tamanho de chave inválido; a utilizar %u bits\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s não faz sentido com %s!\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: destinatários (-r) dados sem utilizar uma cifra de chave pública\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "não pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, fuzzy, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualização da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritmo de dispersão inválido `%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de política de certificação dada é inválida\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de política de assinatura dada é inválida\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de política de assinatura dada é inválida\n"
@@ -3536,7 +3541,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informações de estado para o\n"
@@ -4263,7 +4268,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  Não foi possível assinar.\n"
 
@@ -4465,8 +4470,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -4683,7 +4688,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "A chave está revogada."
 
@@ -4736,7 +4741,7 @@ msgstr "Realmente remover este ID de utilizador? "
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Você deve selecionar pelo menos uma chave.\n"
@@ -4824,169 +4829,169 @@ msgstr "Gravar alterações? "
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave não alterada, nenhuma actualização é necessária.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "Você não pode remover o último ID de utilizador!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "valor inválido\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Identificador de utilizador inexistente.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   assinado por %08lX em %s%s\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s não é um conjunto de caracteres válido\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Características: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 #, fuzzy
 msgid "Notations: "
 msgstr "Notação: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Não há preferências no ID de utilizador tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensível)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossível criar %s: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4994,37 +4999,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Você não pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5033,36 +5038,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tem a certeza de que quer adicioná-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Não pode adicionar um identificador fotográfico a uma chave tipo PGP2.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura válida? (s/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inválida? (s/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5070,38 +5075,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d assinatura removida.\n"
 msgstr[1] "%d assinatura removida.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inválida"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Utilizador \"%s\" está revocado."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5110,223 +5115,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:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Não pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "não pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Você não pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secundária.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Modificar a data de validade para uma chave primária.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "não pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Você tem certeza de que quer adicioná-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notação de assinatura: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com índice %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr "  (não-exportável)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Tem a certeza de que quer revogá-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (não-exportável)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Está prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revogação? (s/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: a assintura do ID do utilizador tem data %d segundos no futuro\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Você não pode remover o último ID de utilizador!\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" já está revocado\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5759,6 +5764,10 @@ msgstr ""
 "Por favor não coloque o endereço de email no nome verdadeiro ou no "
 "comentário\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -6091,56 +6100,56 @@ msgstr "opções de exportação inválidas\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "a pedir a chave %08lX de %s\n"
 msgstr[1] "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "chave `%s' não encontrada: %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "opções de exportação inválidas\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "ignorado `%s': %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com a sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
@@ -6172,253 +6181,253 @@ msgstr "cifrado com algoritmo desconhecido %d\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave pública é %08lX\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "cifrado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, fuzzy, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifragem de chave pública falhou: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados cifrados com chave pública: DEK válido\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "a assumir dados cifrados %s\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifra IDEO não disponível, a tentar utilizar %s em substituição\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensagem não tinha a sua integridade protegida\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "decifragem correcta\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocação solitária - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verificação de assinatura suprimida\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "não consigo tratar estas assinaturas múltiplas\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, fuzzy, c-format
 msgid "Key available at: "
 msgstr "Nenhuma ajuda disponível"
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "AVISO: Esta chave não está certificada com uma assinatura confiável!\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 #, fuzzy
 msgid "unknown"
 msgstr "versão desconhecida"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritmo de chave pública desconhecido"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossível verificar assinatura: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "não é uma assinatura separada\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVISO: várias assinaturas detectadas.  Apenas a primeira será verificada.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
@@ -6492,11 +6501,6 @@ msgstr ""
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opção depreciada \"%s\"\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "AVISO: \"%s\" é uma opção depreciada\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7575,134 +7579,134 @@ msgstr "armadura: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "base de dados de confiança: sincronização falhou: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "impossível criar `%s': %s\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "impossível abrir `%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "base de dados de confiança rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "base de dados de confiança rec %lu: escrita falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "transação de base de dados de confiança muito grande\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diretoria inexistente!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "impossível fechar `%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: falha ao criar registo de versão: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: base de dados de confiança inválida criada\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: base de dados de confiança criada\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "NOTA: não é possível escrever na trustdb\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de dados de confiança inválida\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela de dispersão: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro a actualizar registo de versão: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro ao ler registo de versão: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro ao escrever registo de versão: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de dados de confiança: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de dados de confiança: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: não é um base de dados de confiança\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registo de versão com recnum %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro ao escrever registo de diretório: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registo: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registo: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: base de dados de confiança criada\n"
@@ -8323,16 +8327,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8367,10 +8371,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8390,158 +8394,158 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "%s' já comprimido\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "remover chaves do porta-chaves público"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "A geração de chaves falhou: %s\n"
 msgstr[1] "A geração de chaves falhou: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "motivo da revocação: "
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muda a frase secreta"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Nota: Esta chave foi desactivada.\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "muda a frase secreta"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "motivo da revocação: "
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "falha ao inicializar a base de dados de confiança: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
@@ -8549,43 +8553,43 @@ msgstr "remoção do bloco de chave falhou: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A geração de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8593,22 +8597,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "motivo da revocação: "
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8616,81 +8620,81 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI não suportado"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP válido encontrado.\n"
@@ -8711,7 +8715,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8760,33 +8764,33 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "comandos em conflito\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
@@ -9020,7 +9024,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "verificação da assinatura criada falhou: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
@@ -9075,7 +9079,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -9124,42 +9128,42 @@ msgstr ""
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "certificado incorrecto"
@@ -9354,6 +9358,11 @@ msgstr "Gerar um certificado de revogação para esta assinatura? (s/N)"
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:433
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "erro na criação da frase secreta: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9425,138 +9434,138 @@ msgstr "remoção do bloco de chave falhou: %s\n"
 msgid "no valid recipients given\n"
 msgstr "resposta do agente inválida\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "list external keys"
 msgstr "listar as chaves secretas"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 #, fuzzy
 msgid "import certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "export certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "criar saída com armadura ascii"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omissão"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "à lista de porta-chaves"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "modo não-interactivo: nunca perguntar"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "assumir não para a maioria das perguntas"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9567,27 +9576,27 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a operação por omissão depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "impossível ligar a `%s': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "impossível fechar `%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9617,7 +9626,7 @@ msgstr "erro na criação da frase secreta: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "erro na criação da frase secreta: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -9657,7 +9666,7 @@ msgstr "rev? problema ao verificar revogação: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -10024,12 +10033,6 @@ msgstr "%s: impossível criar directoria: %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/crlcache.c:948
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "erro na leitura de `%s': %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
@@ -10716,93 +10719,93 @@ msgstr ""
 msgid "usage: %s [options] "
 msgstr "uso: gpg [opções] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s não é permitido com %s!\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "criação de armadura falhou: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "frase secreta demasiado longa\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s: versão de ficheiro inválida %d\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "armadura: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "não processado"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "demasiadas preferências `%c'\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11172,105 +11175,105 @@ msgstr "preferência %c%lu duplicada\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "sair"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FICHEIRO|carregar módulo de extensão FICHEIRO"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Uso: gpg [opções] [ficheiros] (-h para ajuda)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "remoção do bloco de chave falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "frase secreta demasiado longa\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "destinatário por omissão desconhecido `%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "o gpg-agent não está disponível nesta sessão\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
@@ -11336,12 +11339,12 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -11531,6 +11534,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "a escrever para `%s'\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "A chave foi substituída"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "O nome não pode começar com um dígito\n"
 
@@ -11788,10 +11800,6 @@ msgstr ""
 #~ msgstr "impossível abrir %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "erro na escrita do porta-chaves `%s': %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "erro na leitura de `%s': %s\n"
 
diff --git a/po/ro.po b/po/ro.po
index ce110e2..2588fc0 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2017-12-19 12:30+0100\n"
 "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "am eşuat să stochez amprenta: %s\n"
@@ -30,53 +30,53 @@ msgstr "am eşuat să stochez amprenta: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "frază-parolă invalidă"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -87,28 +87,28 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "frază-parolă prea lungă\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 #, fuzzy
 msgid "Quality:"
 msgstr "validitate: %s"
@@ -119,17 +119,17 @@ msgstr "validitate: %s"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -137,83 +137,83 @@ msgid ""
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frază-parolă incorectă"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "PIN too long"
 msgstr "linie prea lungă"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frază-parolă prea lungă\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter invalid în nume\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorect"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frază-parolă incorectă"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, 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:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -233,9 +233,9 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "algoritm rezumat %d nu este suportat\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
@@ -243,15 +243,15 @@ msgstr "nu pot crea `%s': %s\n"
 
 #: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, 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:2513
+#: agent/command-ssh.c:2467
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -296,108 +296,96 @@ msgid ""
 msgstr ""
 "Vă rugăm introduceţi fraza-parolă; aceasta este o propoziţie secretă \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: am eşuat să creez hashtable: %s\n"
 
-#: agent/divert-scd.c:118
-#, fuzzy
-msgid "Please insert the card with serial number"
-msgstr ""
-"Vă rugăm scoateţi cardul curent şi introducaţi unul cu număr de serie:\n"
-"   %.*s\n"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 #, fuzzy
 msgid "Admin PIN"
 msgstr "|A|PIN Admin"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Repetaţi acest PIN: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Repetaţi acest PIN: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Repetaţi acest PIN: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-ul nu a fost repetat corect; mai încercaţi o dată"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, fuzzy, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
+#: agent/genkey.c:154
 #, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "eroare la crearea frazei-parolă: %s\n"
-
-#: agent/genkey.c:150
-#, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "%s: eroare scriere înregistrare dir: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Introduceţi fraza-parolă\n"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -405,7 +393,7 @@ msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "Numele trebuie să fie de cel puţin 5 caractere\n"
 msgstr[1] "Numele trebuie să fie de cel puţin 5 caractere\n"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -413,387 +401,386 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Folosiţi oricum această cheie? (d/N) "
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Aveţi nevoie de o frază-parolă pentru a vă proteja cheia secretă.\n"
 "\n"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "Cheia este înlocuită"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "locvace"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai tăcut"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizează baza de date de încredere"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NUME|setează charset-ul pentru terminal ca NUME"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "nu este suportat(ă)"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "nu este suportat(ă)"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|foloseşte modul frază-parolă N"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "foloseÅŸte gpg-agent"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Raportaţi bug-uri la <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "citesc opţiuni din `%s'\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, 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:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "scriu cheia secretă în `%s'\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, 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:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: 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:2381
+#: agent/gpg-agent.c:2391
 #, fuzzy, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "fstat(%d) a eşuat în %s: %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, fuzzy, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "%s: nu pot crea director: %s\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2832
+#: agent/gpg-agent.c:2842
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, fuzzy, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "actualizarea secretului a eÅŸuat: %s\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: sărită: %s\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nu este disponibil în această sesiune\n"
@@ -819,7 +806,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -829,7 +816,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -886,42 +873,42 @@ msgstr "anulată"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eroare la crearea frazei-parolă: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "fişier opţiuni `%s': %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "eroare citire în `%s': %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "părţi ale cheii secrete nu sunt disponibile\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "eroare citire în `%s': %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "Eroare: amprentă formatată invalid.\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -934,19 +921,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "da"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -959,7 +946,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -969,36 +956,54 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "eroare la citire `%s': %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 #, fuzzy
 msgid "Change passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+#, fuzzy
+msgid "Please insert the card with serial number"
+msgstr ""
+"Vă rugăm scoateţi cardul curent şi introducaţi unul cu număr de serie:\n"
+"   %.*s\n"
+
+#: agent/findkey.c:1231
+#, c-format
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1741
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -1006,13 +1011,13 @@ msgid ""
 "%%0A?"
 msgstr "Doriţi într-adevăr să ştergeţi cheile selectate? (d/N) "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
 msgstr "activează cheia"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1034,7 +1039,7 @@ msgstr ""
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
@@ -1076,7 +1081,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -1138,12 +1143,12 @@ 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:905
+#: common/sysutils.c:880
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "actualizarea a eÅŸuat: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "renaming '%s' to '%s' failed: %s\n"
@@ -1375,7 +1380,7 @@ msgid "algorithm: %s"
 msgstr "validitate: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1547,7 +1552,7 @@ msgstr "redenumirea `%s' ca `%s' a eÅŸuat: %s\n"
 msgid "iconv_open failed: %s\n"
 msgstr "nu pot deschide fiÅŸierul: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a eÅŸuat: %s\n"
@@ -1586,7 +1591,7 @@ msgstr "cheia publică %s nu a fost găsită: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "scriu cheia secretă în `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1763,7 +1768,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent nu este disponibil în această sesiune\n"
@@ -1808,7 +1813,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "generează un certificat de revocare"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1836,7 +1841,7 @@ msgstr "nu pot face acest lucru în modul batch\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Această comandă nu este permisă în modul %s.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "părţi ale cheii secrete nu sunt disponibile\n"
@@ -1901,15 +1906,15 @@ msgstr "URL pentru a aduce cheia publică: "
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
@@ -2255,27 +2260,27 @@ msgstr "Nu sunt permise comenzi administrare\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comandă invalidă  (încercaţi \"ajutor\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru această comandă\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "nu pot deschide `%s'\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia \"%s\" nu a fost găsită: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2337,8 +2342,8 @@ msgid "subkey"
 msgstr "Pubkey: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a eÅŸuat: %s\n"
@@ -2404,15 +2409,15 @@ msgstr "nu puteţi folosi algoritmul de cifrare `%s' câtă vreme în modul %s\n
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, fuzzy, c-format
 #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "nu puteţi folosi algoritmul de cifrare `%s' câtă vreme în modul %s\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2437,7 +2442,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2547,12 +2552,12 @@ msgstr "exportul cheilor secrete nu este permis\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "cheia %s: cheie stil PGP 2.x - sărită\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTISMENT: nimic exportat\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, fuzzy, c-format
 #| msgid "error creating `%s': %s\n"
@@ -2620,297 +2625,297 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fişier]|crează o semnătură"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fişier]|crează o semnătură text în clar"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "crează o semnătură detaşată"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "cifrează datele"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "cifrează numai cu cifru simetric"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "decriptează datele (implicit)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "verifică o semnătură"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "enumeră chei"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "enumeră chei şi semnături"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr "enumeră şi verifică semnăturile cheii"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "enumeră chei şi amprente"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "enumeră chei secrete"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "generează un certificat de revocare"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "ÅŸterge chei de pe inelul de chei public"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "ÅŸterge chei de pe inelul de chei secret"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "semnează o cheie"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "semnează o cheie local"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "generează o nouă perechi de chei"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "semnează o cheie"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "semnează o cheie local"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "semnează sau editează o cheie"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "schimbă fraza-parolă"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "exportă chei"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "exportă chei pentru un server de chei"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "importă chei de la un server de chei"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "caută pentru chei pe un server de chei"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "actualizează toate cheile de la un server de chei"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "importă/combină chei"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr "afişează starea cardului"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr "schimbă data de pe card"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr "schimbă PIN-ul unui card"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "actualizează baza de date de încredere"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [fişiere]|afişează rezumate mesaje"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr "foloseÅŸte comportament strict OpenPGP"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "întreabă înainte de a suprascrie"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "crează ieşire în armură ascii"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 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:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "foloseÅŸte modul text canonic"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|setează nivel de compresie N (0 deactivează)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importă chei de la un server de chei"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "enumeră şi verifică semnăturile cheii"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "enumeră chei secrete"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "foloseÅŸte acest id-utilizator pentru a semna sau decripta"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2918,7 +2923,7 @@ msgstr ""
 "@\n"
 "(Arată pagina man pentru o listă completă a comenzilor şi opţiunilor)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2948,13 +2953,13 @@ msgstr ""
 " --list-keys [nume]         arată chei\n"
 " --fingerprint [nume]       arată amprente\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2969,7 +2974,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "operaţiunea implicită depinde de datele de intrare\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2977,79 +2982,79 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "folosire: gpg [opţiuni] "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "comenzi în conflict\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, fuzzy, c-format
 #| msgid "no = sign found in group definition `%s'\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "nu am găsit nici un semn = în definiţia grupului `%s'\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigură (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigură (unsafe) pentru fişier configurare `%s'\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "AVERTISMENT: proprietate nesigură (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru fiÅŸier configurare `%s'\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
@@ -3057,7 +3062,7 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3067,7 +3072,7 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fiÅŸier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
@@ -3075,7 +3080,7 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
@@ -3083,7 +3088,7 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3094,7 +3099,7 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fiÅŸier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
@@ -3102,490 +3107,490 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "arată căruia dintre inelele de chei îi aparţine o cheie enumerată"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semnătură corespunzătoare în inelul secret\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "opţiune necunoscută `%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Această comandă nu este permisă în modul %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "NOTĂ: %s nu este pentru o folosire normală!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Nu este o adresă de email validă\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid character set\n"
 msgid "'%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opţiuni server de chei invalide\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "opţiuni server de chei invalide\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opţiuni import invalide\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "opţiuni import invalide\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opţiuni export invalide\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "opţiuni export invalide\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opţiuni verificare invalide\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr "opţiuni verificare invalide\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execuţie ca %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opţiuni verificare invalide\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "opţiuni enumerare invalide\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fiÅŸier core!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s înlocuieşte %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nu va rula cu memorie neprotejată (insecure) pentru că %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie să fie mai mare decât 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie să fie mai mare decât 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth trebuie să fie în intervalul de la 1 la 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalid; trebuie să fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalid; trebuie să fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTĂ: modul S2K simplu (0) este contraindicat cu insistenţă\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie să fie 0, 1 sau 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "preferinţe implicite invalide\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "preferinţe cifrare personale invalide\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "preferinţe cifrare personale invalide\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "preferinţe rezumat personale invalide\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "preferinţe compresie personale invalide\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "lungime cheie invalidă; folosesc %u biţi\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge încă cu %s!\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "nu puteţi folosi algoritmul de cifrare `%s' câtă vreme în modul %s\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, fuzzy, c-format
 #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "nu puteţi folosi algoritmul de compresie `%s' câtă vreme în modul %s\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am eşuat să iniţializez TrustDB:%s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISMENT: destinatari (-r) furnizaţi fără a folosi cifrare cu cheie "
 "publică\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, fuzzy, c-format
 #| msgid "symmetric encryption of `%s' failed: %s\n"
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "cifrarea simetrică a lui `%s' a eşuat: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nu puteţi folosi --symmetric --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "nu puteţi folosi --symmetric --encrypt câtă vreme în modul %s\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nu puteţi folosi --symmetric --sign --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "nu puteţi folosi --symmetric --sign --encrypt câtă vreme în modul %s\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepţie server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie eÅŸuat: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "export cheie eÅŸuat: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "căutare server de chei eşuată: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei eşuată: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a eÅŸuat: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a eÅŸuat: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Daţi-i drumul şi scrieţi mesajul ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semnături furnizat este invalid\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
@@ -3599,7 +3604,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrie informaţii de stare în acest FD"
 
@@ -4342,7 +4347,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sunteţi sigur(ă) că doriţi să ştergeţi permanent? (d/N)"
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  Nu pot semna.\n"
 
@@ -4519,8 +4524,8 @@ msgstr "Am verificat această cheie foarte atent.\n"
 msgid "Really sign? (y/N) "
 msgstr "Doriţi cu adevărat să semnaţi? (d/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a eÅŸuat: %s\n"
@@ -4733,7 +4738,7 @@ msgstr ""
 "  pentru semnături irevocabile (nrsign), sau orice combinaţie a acestora\n"
 "  (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "Cheia este revocată."
 
@@ -4784,7 +4789,7 @@ msgstr "Ştergeţi într-adevăr acest ID utilizator? (d/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Mutaţi într-adevăr cheia primară? (d/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr "Trebuie să selectaţi exact o cheie.\n"
 
@@ -4865,173 +4870,173 @@ msgstr "Salvaţi schimbările?  (d/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Terminaţi fără a salva?  (d/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Cheia nu a fost schimbată aşa că nici o actualizare a fost necesară.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "Nu puteţi şterge ultimul ID utilizator!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "amprentă invalidă"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "am eşuat să stochez amprenta: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "valoare invalidă\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Nu există acest ID utilizator.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 #| msgid "Nothing to sign with key %s\n"
 msgid "Nothing to sign.\n"
 msgstr "Nimic de semnat cu cheia %s\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid expiration time\n"
 msgstr "`%s' nu este expirare de semnătură validă\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "amprentă invalidă"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "cheia \"%s\" nu a fost găsită: %s\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Capabilităţi: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr "Server de chei no-modify"
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaţie:"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nu există nici o preferinţă pentru un ID utilizator stil PGP 2.x.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Această cheie a fost revocată pe %s de %s cheia %s\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Această cheie poate fi revocată de %s cheia %s"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "creată: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr "revocată: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr "expirată: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "expiră: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr "folosire: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr "nr-card: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr "încredere: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr "validitate: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Această cheie a fost deactivată"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5040,17 +5045,17 @@ msgstr ""
 "corectă dacă nu reporniţi programul.\n"
 
 #
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr "revocată"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "expirată"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5060,18 +5065,18 @@ msgstr ""
 "              Această comandă poate cauza ca un alt ID utilizator\n"
 "              să devină ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Nu puteţi schimba data de expirare a unei chei v3\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5080,35 +5085,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sunteţi încă sigur(ă) că doriţi să o adăugaţi? (d/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nu puteţi adăuga o poză ID la o cheie stil PGP2.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Ştergeţi această semnătură bună? (d/N/t)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Ştergeţi această semnătură invalidă? (d/N/t)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Ştergeţi această semnătură necunoscută? (d/N/t)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Ştergeţi într-adevăr această auto-semnătură? (d/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5116,37 +5121,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:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Nu am ÅŸters nimic.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "invalid(ă)"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5156,43 +5161,43 @@ msgstr ""
 "             desemnat poate face ca unele versiuni de PGP să respingă "
 "cheia.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nu puteţi adăuga un revocator desemnat la o cheie stil PGP 2.x.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduceţi ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nu puteţi desemna o cheie ca propriul său revocator desemnat\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "această cheie a fost deja desemnată ca un revocator\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi "
 "anulată!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sunteţi sigur(ă) că doriţi să desemnaţi această cheie ca şi un revocator "
 "desemnat? (d/N) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5203,183 +5208,183 @@ msgstr ""
 "Sunteţi sigur(ă) că doriţi să desemnaţi această cheie ca şi un revocator "
 "desemnat? (d/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primară.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nu puteţi schimba data de expirare a unei chei v3\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primară.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s nu este certificată reciproc (cross-"
 "certified)\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Vă rugăm selectaţi exact un ID utilizator.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "auto-semnătură v3 sărită pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduceţi URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sunteţi sigur(ă) că doriţi să o folosiţi? (d/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sunteţi sigur(ă) că doriţi să o folosiţi? (d/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notare semnătură: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, fuzzy, c-format
 #| msgid "No subkey with index %d\n"
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "semnată de cheia d-voastră %s la %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (non-exportabilă)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Această semnătură a expirat pe %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sunteţi încă sigur(ă) că doriţi să o revocaţi? (d/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creaţi un certificat de revocare pentru această semnătură? (d/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "AÅ£i semnat aceste ID-uri utilizator pe cheia %s:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr " (non-revocabilă)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocată de cheia d-voastră %s pe %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunteţi pe cale să revocaţi aceste semnături:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Doriţi într-adevăr să creaţi certificatele de revocare? (d/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "nici o cheie secretă\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, fuzzy, c-format
 #| msgid "revoke a user ID"
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "revocă un ID utilizator"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISMENT: o semnătură ID utilizator este datată %d secunde în viitor\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Nu puteţi şterge ultimul ID utilizator!\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocată.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocată.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, 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"
@@ -5811,6 +5816,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Vă rugăm nu puneţi adresa de email în numele real sau comentariu\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -6146,7 +6155,7 @@ msgstr "protocol server de chei invalid (us %d!=handler %d)\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nu este un ID de cheie: sărit\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -6154,49 +6163,49 @@ msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "reactualizez %d chei de la %s\n"
 msgstr[1] "reactualizez %d chei de la %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cheia \"%s\" nu a fost găsită pe serverul de chei\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "cheia nu a fost găsită pe serverul de chei\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "cer cheia %s de la %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 #| msgid "no keyserver action!\n"
 msgid "no keyserver known\n"
 msgstr "nici o acţiune pentru serverul de chei!\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "sărită \"%s\": %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "trimit cheia %s lui %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 #| msgid "requesting key %s from %s\n"
 msgid "requesting key from '%s'\n"
 msgstr "cer cheia %s de la %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
@@ -6229,255 +6238,255 @@ msgstr "cifrat cu un algoritm necunoscut %d\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "fraza-parolă generată cu un algoritm rezumat necunoscut %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr "cheia publică este %s\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "cifrat cu cheia %u-bit %s, ID %s, creată %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrat cu cheia %s, ID %s\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrată cu %lu fraze-parolă\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrată cu 1 frază-parolă\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decriptarea cu cheie publică a eşuat: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "date cigrate cu cheie publică: DEK bun\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "presupunem date cifrate %s\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "cifru IDEA indisponibil, vom încerca să folosim %s în loc\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISMENT: mesajul nu a avut integritatea protejată\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "decriptarea a eÅŸuat: %s\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "decriptare OK\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decriptarea a eÅŸuat: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTĂ: expeditorul a cerut \"doar-pentru-ochii-d-voastră\"\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nume fiÅŸier original='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocare standalone - folosiţi \"gpg --import\" pentru a aplica\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Semnătură bună din \"%s\""
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Semnătură INCORECTĂ din \"%s\""
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Semnătură expirată din \"%s\""
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Semnătură bună din \"%s\""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verificare semnătură eliminată\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "nu pot mânui aceste semnături multiple\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Semnătură făcută %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               folosind cheia %s %s\n"
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Semnătură făcută %s folosind cheia %s cu ID %s\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Cheie disponibilă la: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[nesigur]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 "AVERTISMENT: Această cheie nu este certificată de o semnătură de încredere!\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Semnătură expirată %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Semnătura expiră %s\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "semnătură %s, algoritm rezumat %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "binar"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "necunoscut"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "algoritm pubkey necunoscut"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nu pot verifica semnătura: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "nu o semnătură detaşată\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVERTISMENT: am detectat multiple semnături.  Numai prima va fi verificată.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "semnătură de sine stătătoare (standalone) de clasă 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "semnătură de stil vechi (PGP 2.x)\n"
@@ -6552,11 +6561,6 @@ msgstr ""
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opţiune învechită \"%s\"\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "AVERTISMENT: \"%s\" este o opţiune învechită\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7678,137 +7682,137 @@ msgstr "eroare citire în `%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: sincronizarea a eÅŸuat: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 #| msgid "can't create lock for `%s'\n"
 msgid "can't create lock for '%s'\n"
 msgstr "nu pot crea încuietoare (lock) pentru `%s'\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 #| msgid "can't lock `%s'\n"
 msgid "can't lock '%s'\n"
 msgstr "nu pot încuia (lock) `%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb rec %lu: lseek a eÅŸuat: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb rec %lu: scrierea a eÅŸuat (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "tranzacţia trustdb prea mare\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: directorul nu există!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't access '%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: am eşuat să creez înregistrare versiune: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: a fost creat trustdb invalid\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: a fost creat trustdb\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "NOTĂ: nu poate fi scris în trustdb\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: trustdb invalid\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: am eşuat să creez hashtable: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: eroare actualizare înregistrare versiune: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: eroare citire înregistrare versiune: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: eroare scriere înregistrare versiune: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek a eÅŸuat: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: citirea a eÅŸuat (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nu e un fiÅŸier trustdb\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: înregistrare versiune cu recnum %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versiune fişier invalidă %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: eroare citire înregistrare liberă: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: eroare scriere înregistrare dir: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: eroare setere la zero a înregistrării: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: adăugarea unei înregistrări a eşuat: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: a fost creat trustdb\n"
@@ -8437,16 +8441,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8481,10 +8485,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "apelul PIN a returnat eroare: %s\n"
@@ -8506,58 +8510,58 @@ msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minimă este %d\n"
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr "cheia există deja\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "cheia existentă va fi înlocuită\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr "generez o nouă cheie\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "generez o nouă cheie\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "am eşuat să stochez cheia: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "răspunsul nu conţine modulul RSA\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "răspunsul nu conţine exponentul public RSA\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, fuzzy, c-format
 #| msgid "response does not contain the RSA public exponent\n"
 msgid "response does not contain the EC public key\n"
 msgstr "răspunsul nu conţine exponentul public RSA\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "vă rugăm aşteptaţi câtă vreme este creată noua cheie ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr "generarea cheii a eÅŸuat\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8565,100 +8569,100 @@ msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "generarea cheii este completă (%d secunde)\n"
 msgstr[1] "generarea cheii este completă (%d secunde)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "răspunsul nu conţine datele cheii publice\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 #, 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:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 #, 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:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 #, 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:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "modulus-ul RSA lipseşte sau nu are %d biţi\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "exponentul public RSA lipseşte sau are mai mult de %d biţi\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Notă: Această cheie a fost deactivată.\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 #, 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:2026
+#: scd/app-nks.c:2082
 #, 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:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eroare la obţinere noului PIN: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "am eşuat să stochez amprenta: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "am eşuat să stochez data creării: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "eroare la recuperarea stării CHV de pe card\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "citirea cheii publice a eÅŸuat: %s\n"
@@ -8666,43 +8670,43 @@ msgstr "citirea cheii publice a eÅŸuat: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minimă este %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificarea CHV%d a eÅŸuat: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "cardul este încuiat permanent!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, fuzzy, c-format
 #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@ -8713,22 +8717,22 @@ msgstr[0] ""
 msgstr[1] ""
 "%d încercări PIN Admin rămase înainte de a încuia cardul permanent\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "accesul la comenzile de administrare nu este configurată\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, fuzzy, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minimă este %d\n"
@@ -8736,82 +8740,82 @@ msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minimă este %d\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr "|AN|PIN Admin Nou"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr "|N|PIN Nou"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Vă rugăm introduceţi PIN%%0A[semnături făcute: %lu]"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr "eroare la citirea datelor aplicaţiei\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "eroare la citirea amprentei DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "timestamp-ul de creare lipseÅŸte\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "prime-ul RSA %s lipseşte sau nu are %d biţi\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "URI nesuportat"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structură invalidă a cardului OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "semnătură %s, algoritm rezumat %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "semnături create până acum: %lu\n"
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "verificarea PIN-ului Admin este deocamdată interzisă prin această comandă\n"
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@ -8833,7 +8837,7 @@ msgstr "|N|PIN Nou"
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8882,33 +8886,33 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "arată comenzi administrare"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
@@ -9142,7 +9146,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "verificarea semnăturii create a eşuat: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
@@ -9197,7 +9201,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -9245,42 +9249,42 @@ msgstr ""
 "\"%.*s\"\n"
 "cheia %u-bit %s, ID %s, creată %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "certificat incorect"
@@ -9477,6 +9481,11 @@ msgstr "Creaţi un certificat de revocare desemnat pentru această cheie? (d/N)
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:433
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "eroare la crearea frazei-parolă: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9550,135 +9559,135 @@ msgstr "stergere keyblock a eÅŸuat: %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Nici o descriere dată)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "list external keys"
 msgstr "enumeră chei secrete"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 #, fuzzy
 msgid "import certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "export certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 #, fuzzy
 msgid "register a smartcard"
 msgstr "adaugă o cheie la un smartcard"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "nu folosi deloc terminalul"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crează ieşire în armură ascii"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NUME|foloseşte NUME ca cheie secretă implicită"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "adaugă acest inel de chei la lista inelelor de chei"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NUME|foloseşte algoritm cifrare NUME pentru fraza-parolă"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NUME|foloseÅŸte algoritm cifrare NUME"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NUME|foloseÅŸte algoritm rezumat mesaj NUME"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "modul batch: nu întreba niciodată"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "presupune da la cele mai multe întrebări"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "presupune nu la cele mai multe întrebări"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9689,27 +9698,27 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "operaţiunea implicită depinde de datele de intrare\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "nu mă pot conecta la `%s': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "opţiune necunoscută `%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9739,7 +9748,7 @@ msgstr "eroare la obţinere noului PIN: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "eroare la obţinerea numărului serial: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -9779,7 +9788,7 @@ msgstr "rev? probleme la verificare revocării: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -10148,12 +10157,6 @@ msgstr "nu pot crea directorul `%s': %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "eroare în `%s': %s\n"
 
-#: dirmngr/crlcache.c:948
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "eroare la citire `%s': %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
@@ -10851,98 +10854,98 @@ msgstr ""
 msgid "usage: %s [options] "
 msgstr "folosire: gpg [opţiuni] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, 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:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a eÅŸuat: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "linie prea lungă"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "amprentă invalidă"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 #| msgid "read error in `%s': %s\n"
 msgid "%s:%u: read error: %s\n"
 msgstr "eroare citire în `%s': %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "neforţat(ă)"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many redirections\n"
 msgstr "prea multe preferinţe de cifrare\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11318,105 +11321,105 @@ msgstr "preferinţa `%s' duplicată\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "termină"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FIŞIER|încarcă modulul extensie FIŞIER"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Folosire: gpg [opţiuni] [fişiere] (-h pentru ajutor)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "citirea cheii publice a eÅŸuat: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "linie prea lungă"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "opţiune necunoscută `%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "semnarea a eÅŸuat: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "gpg-agent nu este disponibil în această sesiune\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
@@ -11483,12 +11486,12 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "eroare în `%s': %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
@@ -11679,6 +11682,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "%s: eroare scriere înregistrare dir: %s\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "Cheia este înlocuită"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Numele nu poate începe cu o cifră\n"
 
@@ -11956,10 +11968,6 @@ msgstr ""
 #~ msgstr "nu pot deschide %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "eroare la scrierea inelului de chei `%s': %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "eroare în `%s': %s\n"
 
diff --git a/po/ru.gmo b/po/ru.gmo
index 49b4ec8..b17dfc5 100644
--- a/po/ru.gmo
+++ b/po/ru.gmo
diff --git a/po/ru.po b/po/ru.po
index 1523281..e109550 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2020-07-20 17:41+0100\n"
 "Last-Translator: Ineiev <ineiev@gnu.org>\n"
 "Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11) ? 0 : ((n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2);\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "�бой при блокировке дл� ввода парол�: %s\n"
@@ -33,49 +33,49 @@ msgstr "�бой при блокировке дл� ввода парол�: %s\
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|Отмена (_C)"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|Да (_Y)"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|�ет (_N)"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|Сохранить в ди�петчере паролей (_S)"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Вы дей�твительно хотите, чтобы фраза-пароль была видна на �кране?"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|Показывать фразу-пароль"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|Скрывать фразу-пароль"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -86,7 +86,7 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -97,14 +97,14 @@ msgstr ""
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -112,7 +112,7 @@ msgstr "Слишком длинна� фраза-пароль"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Стойко�ть:"
 
@@ -122,95 +122,95 @@ msgstr "Стойко�ть:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Стойко�ть введенного выше тек�та. Прокон�ультируйте�ь у админи�тратора о "
 "критери�х оценки �тойко�ти."
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "Введите PIN, чтобы �делать �екретный ключ до�тупным в �том �еан�е"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 "Введите фразу-пароль, чтобы �делать �екретный ключ до�тупным в �том �еан�е"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr "PIN:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Фраза-пароль:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "не подходит - попробуйте еще раз"
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (попытка %d из %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr "Повторите:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 msgid "PIN too long"
 msgstr "Слишком длинный PIN"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 msgid "Passphrase too long"
 msgstr "Слишком длинна� фраза-пароль"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 msgid "Invalid characters in PIN"
 msgstr "�едопу�тимые �имволы в PIN"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr "Слишком короткий PIN"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad PIN"
 msgstr "�еверный PIN"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad Passphrase"
 msgstr "�еверна� фраза-пароль"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Повторите фразу-пароль:"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, 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:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -233,24 +233,24 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ключи ssh длиннее %d бит не поддерживают��\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, 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
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, 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:2513
+#: agent/command-ssh.c:2467
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "ошибка получени� �пи�ка карт: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, 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:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr "Позволить"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Отказать"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Введите фразу-пароль дл� ключа ssh%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -296,87 +296,79 @@ msgstr ""
 "Введите фразу-пароль дл� защиты полученного �екретного ключа%%0A   %s%%0A   "
 "%s%%0Aвнутри хранилища ключей агента gpg"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "�бой �оздани� потока из �окета: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "В�тавьте карту � �ерийным номером"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "�дмини�тративный PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "Код разблокировки PIN (PUK)"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Код �бро�а"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr "�ажмите кнопку подтверждени� на карте."
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr "Вводите на клавиатуре �читывател�."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Повторите код �бро�а"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Повторите ввод PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Повторите ввод PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Код �бро�а повторен неверно; попробуйте еще раз"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK повторен неверно; попробуйте еще раз"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN повторен неверно; попробуйте еще раз"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Введите PIN%s%s%s дл� до�тупа к карте"
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "ошибка �оздани� временного файла: %s\n"
-
-#: agent/genkey.c:150
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "ошибка запи�и во временный файл: %s\n"
+#: agent/genkey.c:154
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "ошибка запи�и в %s: %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 msgid "Enter new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "Вы не ввели фразу-пароль!%0AПу�та� фраза-пароль недопу�тима."
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -385,11 +377,11 @@ msgstr ""
 "Вы не ввели фразу-пароль - �то, как правило, плоха� мы�ль!%0AПодтвердите, "
 "что Вы дей�твительно не хотите защищать �вой ключ."
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr "Да, защита не нужна"
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
@@ -397,7 +389,7 @@ msgstr[0] "Фраза-пароль не должна быть короче %u �
 msgstr[1] "Фраза-пароль не должна быть короче %u �имволов."
 msgstr[2] "Фраза-пароль не должна быть короче %u �имволов."
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -412,242 +404,238 @@ msgstr[2] ""
 "Фраза-пароль должна �одержать по меньшей мере %u цифр или%%0A�пециальных "
 "�имволов."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Фраза-пароль не должна быть изве�тным выражением и не должна быть �о�тавлена"
 "%%0Aпо определенному образцу."
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Внимание: Вы ввели небезопа�ную фразу-пароль."
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 msgid "Take this one anyway"
 msgstr "В�е равно прин�ть"
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Введите фразу-пароль%0Aдл� защиты нового ключа"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 msgid "Please enter the new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Параметры, полезные дл� отладки"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr "запу�к в режиме демона (фоновый режим)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr "запу�к в режиме �ервера (нефоновый режим)"
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-msgid "run in supervised mode"
-msgstr "запу�к в подконтрольном режиме"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr "не от�оедин�ть�� от кон�оли"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr "вывод команд в �тиле sh"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr "вывод команд в �тиле csh"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|вз�ть параметры из файла FILE"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr "Параметры, управл�ющие выводом диагно�тики"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "подробно"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "�ократить подробно�ти"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|�охран�ть журнал режима �ервера в файле FILE"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr "Параметры, управл�ющие на�тройками"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "не и�пользовать демон криптографиче�ких карт"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|и�пользовать программу PGM как демон криптографиче�ких карт"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|и�пользовать программу PGM как демон криптографиче�ких карт"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|принимать некоторые команды по NAME"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "игнорировать запро�ы �мены терминала"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "игнорировать запро�ы �мены ди�пле� XWindow"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "включить поддержку ssh"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|и�пользовать дл� отображени� отпечатков алгоритм ALGO"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "включить поддержку putty"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "Параметры, управл�ющие безопа�но�тью"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|�бра�ывать запомненный PIN через N �екунд"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|�бра�ывать ключи SSH по и�течении N �екунд"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|у�тановить мак�имальный �рок запоминани� PIN N �екунд"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|у�тановить мак�имальный �рок дей�тви� ключа SSH N �екунд"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr "не и�пользовать запомненный PIN при подпи�ывании"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 msgid "disallow the use of an external password cache"
 msgstr "не позвол�ть пользовать�� внешней пам�тью паролей"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "не позвол�ть клиентам помечать ключи как \"доверенные\""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 msgid "allow presetting passphrase"
 msgstr "разрешить преду�танавливать фразу-пароль"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr "Параметры, обе�печивающие правила дл� фраз-паролей"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr "не позвол�ть обходить правила дл� фраз-паролей"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|у�тановить минимальную длину фразы-парол� равной N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|n|требовать дл� новой фразы-парол� не менее N неалфавитных �имволов"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|провер�ть новую фразу-пароль по файлу образцов FILE"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|�читать фразу-пароль у�таревшей через N дней"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 msgid "do not allow the reuse of old passphrases"
 msgstr "не разрешать повторное и�пользование �тарых фраз-паролей"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Параметры, управл�ющие безопа�но�тью"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr ""
 "не позвол�ть вызывающей программе замещать �обой программу ввода парол�"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "не захватывать клавиатуру и мышь"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|и�пользовать программу PGM дл� ввода паролей"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|у�тановить врем� ожидани� ввода парол� N �екунд"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "разрешить ввод фразы-парол� через Emacs"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Об ошибках в программе �ообщайте по адре�у <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Вызов: @GPG_AGENT@ [параметры] (-h - под�казка)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -655,131 +643,136 @@ msgstr ""
 "Синтак�и�: @GPG_AGENT@ [параметры] [команда [аргументы]]\n"
 "Управление �екретными ключами дл� @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "запрошен недопу�тимый уровень отладки '%s'\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана недопу�тима� хеш-функци�\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "чтение параметров из '%s'\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "Замечание: '%s' не �читает�� параметром\n"
 
-#: agent/gpg-agent.c:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "Внимание: параметр \"%s\" не рекомендует��\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не могу �оздать �окет: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "�лишком длинное им� �окета '%s'\n"
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "агент gpg уже запущен - еще один, новый, запущен не будет\n"
 
-#: agent/gpg-agent.c:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "ошибка получени� разового кода дл� �окета\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "ошибка �в�зывани� �окета � '%s': %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "не удало�ь задать права до�тупа дл� '%s': %s\n"
 
-#: agent/gpg-agent.c:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "�лушаем �окет '%s'\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "не могу �оздать каталог '%s': %s\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "�оздан каталог '%s'\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "�бой stat() дл� '%s': %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "невозможно и�пользовать '%s' как домашний каталог\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "ошибка чтени� разового кода из файлового де�криптора %d: %s\n"
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "обработчик 0x%lx дл� файлового де�криптора %d запущен\n"
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "обработчик 0x%lx дл� файлового де�криптора %d завершил��\n"
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "обработчик ssh 0x%lx дл� файлового де�криптора %d запущен\n"
 
-#: agent/gpg-agent.c:2832
+#: agent/gpg-agent.c:2842
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "обработчик ssh 0x%lx дл� файлового де�криптора %d завершил��\n"
 
-#: agent/gpg-agent.c:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "�бой npth_pselect: %s - жду 1 �екунду\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s о�тановлен\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "в �том �еан�е агент gpg не работает\n"
@@ -804,7 +797,7 @@ msgstr ""
 "Синтак�и�: gpg-preset-passphrase [параметры] КОД_КЛЮЧ�\n"
 "Работа � буфером паролей\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -814,7 +807,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -869,42 +862,42 @@ msgstr "отменено\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "ошибка запро�а ввода фразы-парол�: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "ошибка открыти� '%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "файл '%s', �трока %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "выражение \"%s\" в '%s' игнорирует��, �трока %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "�и�темный �пи�ок довери� '%s' не до�тупен\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "недопу�тимый отпечаток в '%s', �трока %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "недопу�тимый признак ключа в '%s', �трока %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "ошибка чтени� '%s', �трока %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "ошибка чтени� �пи�ка доверенных корневых �ертификатов\n"
@@ -917,7 +910,7 @@ msgstr "ошибка чтени� �пи�ка доверенных корнев
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -926,11 +919,11 @@ msgstr ""
 "Дей�твительно аб�олютно верить, что%%0A  \"%s\"%%0Aправильно завер�ет "
 "�ертификаты пользовател�?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 msgid "Yes"
 msgstr "Да"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr "�ет"
@@ -943,7 +936,7 @@ msgstr "�ет"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -954,21 +947,26 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr "Подтверждаю"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr "�еверно"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "ошибка переименовани� '%s' в '%s': %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Замечание: Фразу-пароль никогда не мен�ли.%0AПожалуй�та, �мените ее �ейча�."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -976,26 +974,40 @@ msgid ""
 msgstr ""
 "Фраза-пароль не мен�ла�ь%%0A� %.4s-%.2s-%.2s. Пожалуй�та, �мените ее �ейча�."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 msgid "Change passphrase"
 msgstr "Сменить фразу-пароль"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr "Сменю позже"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+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?"
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+"Проце�� ssh запро�ил до�туп к ключу%%0A  %s%%0A  (%s)%%0AВы хотите �то "
+"позволить?"
+
+#: agent/findkey.c:1741
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Вы дей�твительно хотите удалить ключ � кодом%%0A  %s%%0A  %%C%%0A?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 msgid "Delete key"
 msgstr "Удалить ключ"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1019,7 +1031,7 @@ msgstr "%s ключ и�пользует небезопа�ный (%u-битны
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%zu-битный хеш недопу�тим дл� %u-битного ключа %s\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "�бой проверки �озданной подпи�и: %s\n"
@@ -1058,7 +1070,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "ошибка при дублировании проце��а: %s\n"
@@ -1119,12 +1131,12 @@ msgstr "Внимание: небезопа�ный владелец объект
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Внимание: небезопа�ные права до�тупа объекта %s \"%s\"\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:880
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "ожидаю до�тупа к файлу '%s'\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "�бой при переименовании '%s' в '%s': %s\n"
@@ -1348,7 +1360,7 @@ msgid "algorithm: %s"
 msgstr "алгоритм: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "алгоритм (не поддерживает��): %s"
@@ -1503,7 +1515,7 @@ msgstr "преобразование из '%s' в '%s' недо�тупно\n"
 msgid "iconv_open failed: %s\n"
 msgstr "�бой в iconv_open: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "�бой преобразовани� '%s' в '%s': %s\n"
@@ -1542,7 +1554,7 @@ msgstr "блокировка '%s' не выполнена: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "ожидаю �н�ти� блокировки %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "�лишком �тара� вер�и� %s (нужно %s, е�ть %s)\n"
@@ -1711,7 +1723,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "в �том �еан�е dirmngr не работает\n"
@@ -1750,7 +1762,7 @@ msgstr "недопу�тимое перенаправление HTTP � �ерв
 msgid "server uses an invalid certificate"
 msgstr "на �ервере примен�ет�� непригодный �ертификат"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, c-format
 msgid "Note: %s\n"
 msgstr "Замечание: %s\n"
@@ -1777,7 +1789,7 @@ msgstr "в пакетном режиме Ñ�то дейÑ�твие невозмоÐ
 msgid "This command is only available for version 2 cards\n"
 msgstr "Эта команда до�тупна только дл� карт вер�ии 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Код �бро�а (больше) не до�тупен\n"
@@ -1842,14 +1854,14 @@ msgstr "URL дл� получени� открытого ключа: "
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "ошибка чтени� '%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
@@ -2186,26 +2198,26 @@ msgstr "Команды админиÑ�трированиÑ� не разрешенÑ
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�едопу�тима� команда (�пи�ок команд: \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output дл� данной команды не работает\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "не могу открыть '%s'\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ \"%s\" не найден: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2267,8 +2279,8 @@ msgid "subkey"
 msgstr "подключа"
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�бой при обновлении: %s\n"
@@ -2330,14 +2342,14 @@ msgstr "алгоритм шифровани� '%s' нельз� и�пользо
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм шифровани� '%s' нельз� и�пользовать в режиме %s\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2360,7 +2372,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "Внимание: ключ %s не подходит дл� шифровани� в режиме %s\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2465,12 +2477,12 @@ msgstr "�к�порт �екретных ключей не разрешен\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "ключ %s: ключ типа PGP 2.x - пропущен\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "Внимание: нечего �к�портировать\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, c-format
 msgid "error creating '%s': %s\n"
@@ -2537,282 +2549,282 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "и�пользую подключ %s вме�то первичного ключа %s\n"
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "недопу�тимые значени� дл� параметра \"%s\"\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 msgid "make a signature"
 msgstr "�оздать подпи�ь"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "make a clear text signature"
 msgstr "�оздать тек�товую подпи�ь"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "�оздать отделенную подпи�ь"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "шифрование только �имметричным шифром"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "ра�шифровать данные (по умолчанию)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "проверить подпи�ь"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "выве�ти �пи�ок ключей"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "выве�ти �пи�ок ключей и подпи�ей"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr "выве�ти и проверить подпи�и ключей"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "выве�ти �пи�ок ключей и их отпечатков"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "выве�ти �пи�ок �екретных ключей"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "�оздать новую пару ключей"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 msgid "quickly generate a new key pair"
 msgstr "бы�тро �оздать новую пару ключей"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "quickly add a new user-id"
 msgstr "бы�тро добавить новый идентификатор пользовател�"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 msgid "quickly revoke a user-id"
 msgstr "бы�тро отозвать идентификатор пользовател�"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly set a new expiration date"
 msgstr "бы�тро у�тановить новый �рок дей�тви�"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr "�оздание полноценной пары ключей"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "�оздать �ертификат отзыва"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "удалить ключи из таблицы �екретных ключей"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "quickly sign a key"
 msgstr "бы�тро подпи�ать ключ"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "quickly sign a key locally"
 msgstr "бы�тро подпи�ать ключ локально"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "quickly revoke a user-id"
 msgid "quickly revoke a key signature"
 msgstr "бы�тро отозвать идентификатор пользовател�"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "подпи�ать ключ"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "подпи�ать ключ локально"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "подпи�ать или редактировать ключ"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "�менить фразу-пароль"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "�к�портировать ключи"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "�к�портировать ключи на �ервер ключей"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "импортировать ключи � �ервера ключей"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "и�кать ключи на �ервере ключей"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "обновить в�е ключи � �ервера ключей"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "импортировать/объединить ключи"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr "показать �о�то�ние карты"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr "изменить данные на карте"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr "�менить PIN карты"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "обновить таблицу довери�"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid "print message digests"
 msgstr "выве�ти хеши �ообщений"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "запу�к в режиме �ервера"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|у�тановить правила TOFU дл� ключа"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|и�пользовать NAME как о�новной �екретный ключ"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|зашифровывать также дл� идентификатора пользовател� NAME"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|у�тановить �инонимы �лектронной почты"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr "�трого �ледовать �тандарту OpenPGP"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "�про�ить перед перезапи�ью"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Параметры, управл�ющие безопа�но�тью"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Параметры, управл�ющие выводом диагно�тики"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "вывод в тек�товом формате"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|выводить данные в файл FILE"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "и�пользовать канониче�кий тек�товый режим"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|у�тановить уровень �жати� N (0 - без �жати�)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
 msgstr "Параметры, управл�ющие интерактивно�тью и принудительными дей�тви�ми"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 "|MECHANISMS|и�пользовать механизмы MECHANISMS дл� пои�ка ключей по адре�у "
 "�лектронной почты"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 msgid "import missing key from a signature"
 msgstr "импортировать недо�тающий ключ из подпи�и"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 msgid "include the public key in signatures"
 msgstr "вно�ить открытый ключ в подпи�и"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "полно�тью запретить до�туп к dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "Параметры, управл�ющие на�тройками"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "выве�ти �пи�ок �екретных ключей"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|зашифровать дл� пользовател� USER-ID"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|и�пользовать ключ USER-ID дл� подпи�и и ра�шифровки"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2820,7 +2832,7 @@ msgstr ""
 "@\n"
 "(Полный �пи�ок команд и параметров �м. на �транице man)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2840,11 +2852,11 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Вызов: @GPG@ [параметры] [файлы] (-h - под�казка)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2854,7 +2866,7 @@ msgstr ""
 "Подпи�и и их проверка, шифрование и ра�шифровка\n"
 "Дей�твие по умолчанию зави�ит от входных данных\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2862,95 +2874,95 @@ msgstr ""
 "\n"
 "Поддерживают�� �ледующие алгоритмы:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Хеш-функции: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "�лгоритмы �жати�: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "вызов: %s [параметры] %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "не�овме�тимые команды\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "в определении группы '%s' от�ут�твует знак =\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "Внимание: небезопа�ный владелец домашнего каталога '%s'\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "Внимание: небезопа�ный владелец файла на�троек '%s'\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "Внимание: небезопа�ный владелец файла модул� ра�ширени� '%s'\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "Внимание: небезопа�ные права до�тупа к домашнему каталогу '%s'\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "Внимание: небезопа�ные права до�тупа к файлу на�троек '%s'\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "Внимание: небезопа�ные права до�тупа к файлу модул� ра�ширени� '%s'\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "Внимание: небезопа�ный владелец каталога, �одержащего домашний каталог '%s'\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr ""
 "Внимание: небезопа�ный владелец каталога, �одержащего файл на�троек '%s'\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "Внимание: небезопа�ный владелец каталога,\n"
 "          �одержащего модуль ра�ширени� '%s'\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "Внимание: небезопа�ные права до�тупа к каталогу,\n"
 "          �одержащему домашний каталог '%s'\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2958,482 +2970,482 @@ msgstr ""
 "В�ИМ��ИЕ: небезопа�ные права до�тупа к каталогу,\n"
 "          �одержащему файл на�троек '%s'\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "Внимание: небезопа�ные права до�тупа к каталогу,\n"
 "          �одержащему файл модул� ра�ширени� '%s'\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "неизве�тный �лемент в файле на�троек '%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr "показывать в �пи�ке ключей фотоидентификаторы"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 msgid "show key usage information during key listings"
 msgstr "показывать в �пи�ке ключей �ведени� о назначении ключа"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr "показывать в �пи�ке подпи�ей URL правил"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 msgid "show all notations during signature listings"
 msgstr "показывать в �пи�ке подпи�ей в�е замечани�"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr "показывать в �пи�ке подпи�ей замечани� �тандарта IETF"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr "показывать в �пи�ке подпи�ей пользователь�кие замечани�"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показывать в �пи�ке подпи�ей URL предпочтительных �ерверов ключей"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr ""
 "показывать в �пи�ке ключей дей�твительно�ть идентификаторов пользователей"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "показывать в �пи�ке ключей отозванные и про�роченные идентификаторы "
 "пользователей"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показывать в �пи�ке ключей отозванные и про�роченные подключи"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 msgid "show the keyring name in key listings"
 msgstr "показывать в �пи�ке ключей название таблицы ключей"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 msgid "show expiration dates during signature listings"
 msgstr "показывать в �пи�ке подпи�ей �роки дей�тви�"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "неизве�тные правила TOFU '%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(\"help\" выведет �пи�ок вариантов)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Данна� команда в режиме %s недопу�тима.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "Замечание: %s не предназначен дл� нормального применени�!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' - не допу�тимый �рок дей�тви� подпи�и\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "\"%s\" не �вл�ет�� адре�ом �лектронной почты\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "недопу�тимый режим ввода парол� '%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "недопу�тимый и�точник запро�а '%s'\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' - не допу�тима� таблица �имволов\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "не могу интерпретировать URL �ервера ключей\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопу�тимые параметры �ервера ключей\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "недопу�тимые параметры �ервера ключей\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопу�тимые параметры импорта\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "недопу�тимые параметры импорта\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "недопу�тимый параметр фильтра: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопу�тимые параметры �к�порта\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "недопу�тимые параметры �к�порта\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопу�тимые параметры �пи�ка\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr "недопу�тимые параметры �пи�ка\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr "показать при проверке подпи�и фотоидентификаторы"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr "показать при проверке подпи�и URL правил"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 msgid "show all notations during signature verification"
 msgstr "показать при проверке подпи�ей в�е замечани�"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr "показать при проверке подпи�ей замечани� �тандарта IETF"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr "показать при проверке подпи�ей пользователь�кие замечани�"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "показать при проверке подпи�ей URL предпочтительных �ерверов ключей"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 msgid "show user ID validity during signature verification"
 msgstr ""
 "показать при проверке подпи�ей дей�твительно�ть идентификаторов пользователей"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "показать при проверке подпи�ей отозванные и про�роченные идентификаторы "
 "пользовател�"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "показать при проверке подпи�ей только первичный идентификатор пользовател�"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопу�тимые параметры проверки\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr "недопу�тимые параметры проверки\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запу�ка дл� %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопу�тимый �пи�ок auto-key-locate\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "недопу�тимый �пи�ок auto-key-locate\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "недопу�тимый аргумент дл� параметра \"%.50s\"\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "Внимание: возможно �оздание файла образа пам�ти!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "Внимание: %s отмен�ет %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s � %s недопу�тимо!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s � %s не имеет �мы�ла!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "Внимание: работаем � фальшивым �и�темным временем: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "отказываю�ь работать � небезопа�ной пам�тью из-за %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран недопу�тимый алгоритм шифровани�\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "выбрана недопу�тима� хеш-функци�\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран недопу�тимый алгоритм �жати�\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана недопу�тима� хеш-функци� дл� �ертификации\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "недопу�тимый default-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопу�тимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Замечание: про�той режим S2K (0) �трого противопоказан\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопу�тимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "недопу�тимые предпочтени� по умолчанию\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "недопу�тимые личные предпочтени� шифра\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "недопу�тимые личные предпочтени� шифра\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "недопу�тимые личные предпочтени� хеш-функции\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "недопу�тимые личные предпочтени� алгоритмов �жати�\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "неверный размер ключа; и�пользую %u бит\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает �овме�тно � %s!\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 #| msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм шифровани� '%s' нельз� и�пользовать в режиме %s\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм �жати� '%s' нельз� и�пользовать в режиме %s\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�бой инициализации таблицы довери�: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "В�ИМ��ИЕ: получатели (-r) заданы без и�пользовани� шифровани� � открытым "
 "ключом\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "�бой �имметричного шифровани� '%s': %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt нельз� и�пользовать �овме�тно � --s2k-mode 0\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "в режиме %s нельз� и�пользовать --symmetric --encrypt\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельз� и�пользовать --symmetric --sign --encrypt �овме�тно � --s2k-mode 0\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "в режиме %s нельз� и�пользовать --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�бой при отправке на �ервер ключей: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�бой при получении � �ервера ключей: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "�бой при �к�порте ключа: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "�бой при �к�порте в виде ключа ssh: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�бой при пои�ке на �ервере ключей: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�бой при обновлении � �ервера ключей: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразовани� из тек�тового формата: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразовани� в тек�товый формат: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "недопу�тима� хеш-функци� '%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "ошибка �интак�иче�кого анализа �пецификации ключа '%s': %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "'%s' не �вл�ет�� идентификатором, отпечатком или кодом ключа\n"
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "Внимание: команда не отдана. Пытаю�ь угадать, что имело�ь в виду ...\n"
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Пишите �ообщение ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL правил �ертификации неверен\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL правил подпи�и неверен\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочтительного �ервера ключей неверен\n"
@@ -3446,7 +3458,7 @@ msgstr "|FILE|вз�ть ключи из файла таблицы ключей
 msgid "make timestamp conflicts only a warning"
 msgstr "при не�оответ�твии метки времени - только предупреждение"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить информацию в файл � де�криптором FD"
 
@@ -4176,7 +4188,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Вы в�е равно хотите его подпи�ать? (y/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  �е могу подпи�ать.\n"
 
@@ -4349,8 +4361,8 @@ msgstr "Этот ключ проверен мной очень тщательнÐ
 msgid "Really sign? (y/N) "
 msgstr "Дей�твительно подпи�ать? (y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "подпи�ать не удало�ь: %s\n"
@@ -4552,7 +4564,7 @@ msgstr ""
 "  't' (подпи�и довери�, tsign), 'nr' (неотзываемые, \n"
 "  nrsign) или любое их �очетание (ltsign, tnrsign и т.д.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "Ключ отозван."
 
@@ -4603,7 +4615,7 @@ msgstr "ДейÑ�твительно удалить Ñ�тот идентификаÑ
 msgid "Really move the primary key? (y/N) "
 msgstr "Дей�твительно переме�тить первичный ключ? (y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr "Вы должны выбрать хот� бы один ключ.\n"
 
@@ -4682,134 +4694,134 @@ msgstr "Сохранить изменени�? (y/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без �охранени�? (y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Ключ не измен�л�� - обновление не нужно.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "нельз� удал�ть по�ледний дей�твительный идентификатор пользовател�.\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "�бой отзыва идентификатора пользовател�: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "�бой у�тановки первичного идентификатора пользовател�: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" - не отпечаток\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" - не первичный отпечаток\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "�едопу�тимый идентификатор пользовател� '%s': %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "No matching user IDs."
 msgstr "�ет подход�щих идентификаторов пользователей."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "Nothing to sign.\n"
 msgstr "Подпи�ывать нечего.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Вами не подпи�ано.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "�бой проверки �озданной подпи�и: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' - не допу�тимый �рок дей�тви�\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" - не правильный отпечаток\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "подключ \"%s\" не найден\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr "AEAD: "
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Хеш: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Характери�тики: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr "�е измен�ть на �ервере"
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr "Предпочтительный �ервер ключей: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 msgid "Notations: "
 msgstr "Замечани�: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "В идентификаторе пользовател� типа PGP 2.x не может быть предпочтений.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Следующий ключ был отозван %s пользователем %s ключом %s\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван пользователем %s ключом %s"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr "(о�обо важный)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "     �оздан: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr "    отозван: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr "про�рочен �: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
@@ -4818,30 +4830,30 @@ msgstr "   годен до: %s"
 # perhaps this should be somewhere in help/man
 # (S - подпи�ь, C - �ертификаци�, E - шифрование, A - удо�товерение лично�ти)
 # too long for repeating messages.
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr "назначение: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr "номер карты: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr "доверие: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr "до�товерно�ть: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4849,18 +4861,18 @@ msgstr ""
 "Учтите, что показанна� до�товерно�ть ключа может быть неверной,\n"
 "пока Вы не перезапу�тите программу.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "про�рочен"
 
 # check it
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4870,17 +4882,17 @@ msgstr ""
 "          Эта команда может приве�ти к тому, что первичным �танет �читать��\n"
 "          другой идентификатор пользовател�.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "Внимание: Срок дей�тви� Вашего подключа дл� шифровани� и�текает.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Возможно, надо помен�ть также �рок дей�тви�.\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4889,35 +4901,37 @@ msgstr ""
 "Внимание: Это ключ типа PGP2. Добавление фотоидентификатора может\n"
 "          в некоторых вер�и�х PGP вызвать отбраковку ключа.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить �то? (y/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "�ельз� добавить фотоидентификатор в ключ типа PGP2.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "Такой идентификатор пользовател� на �том ключе уже е�ть!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную дей�твительную подпи�ь? (y/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недей�твительную подпи�ь? (y/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизве�тную подпи�ь? (y/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Дей�твительно удалить данную �амоподпи�ь? (y/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4925,20 +4939,20 @@ msgstr[0] "Удалена %d подпи�ь.\n"
 msgstr[1] "Удалены %d подпи�и.\n"
 msgstr[2] "Удалено %d подпи�ей.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "�ичего не удалено.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "недопу�тим"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Идентификатор пользовател� \"%s\" �жат: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4946,17 +4960,17 @@ msgstr[0] "Идентификатор пользовател� \"%s\": %d под
 msgstr[1] "Идентификатор пользовател� \"%s\": %d подпи�и удалены\n"
 msgstr[2] "Идентификатор пользовател� \"%s\": %d подпи�ей удалено\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4523
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Идентификатор пользовател� \"%s\" уже минимизирован\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Идентификатор пользовател� \"%s\": уже очищен\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4965,39 +4979,39 @@ msgstr ""
 "Внимание: Это ключ типа PGP 2.x. Добавление о�обого отзывающего ключа\n"
 "          может в некоторых вер�и�х PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "�ельз� добавить о�обый отзывающий ключ в ключ типа PGP 2.x.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите идентификатор пользовател� ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельз� назначить отзывающим ключ типа PGP 2.x\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим �амого �еб�\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "�тот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "Внимание: назначение ключа отзывающим невозможно отменить!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -5005,173 +5019,173 @@ msgstr ""
 "Вы уверены, что хотите изменить �рок дей�тви� �разу не�кольких подключей? (y/"
 "N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена �рока дей�тви� подключа.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена �рока дей�тви� первичного ключа.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "�ельз� изменить �рок дей�тви� ключа v3\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 msgid "Changing usage of a subkey.\n"
 msgstr "Смена режимов и�пользовани� подключа.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 msgid "Changing usage of the primary key.\n"
 msgstr "Смена режимов и�пользовани� первичного ключа.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "подпи�ывающий подключ %s уже перекре�тно заверен\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "подключ %s не дл� подпи�ей, он не нуждает�� в перекре�тном заверении\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите ровно один идентификатор пользовател�.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропу�к �амоподпи�и v3 на идентификаторе пользовател� \"%s\"\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтительного �ервера ключей: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Вы дей�твительно хотите заменить его? (y/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Вы дей�твительно хотите удалить его? (y/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 msgid "Enter the notation: "
 msgstr "Введите замечание: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 msgid "Proceed? (y/N) "
 msgstr "Продолжить? (y/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "�ет идентификатора пользовател� � индек�ом %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "�ет идентификатора пользовател� � хешем %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "�ет подключа � идентификатором ключа '%s'.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "�ет подключа � индек�ом %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Идентификатор пользовател�: \"%s\"\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подпи�ано Вашим ключом %s %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (не�к�портируема�)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок дей�тви� подпи�и и�тек %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать �ертификат отзыва дл� данной подпи�и? (y/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подпи�али �ти идентификаторы пользователей на ключе %s:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr " (неотзываема�)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отозвано Вашим ключом %s %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете �ледующие подпи�и:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Дей�твительно �оздать �ертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "нет �екретного ключа\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "попытка отзыва непользователь�кого идентификатора: %s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Идентификатор пользовател� \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "Внимание: подпи�ь идентификатора пользовател� датирована %d �екундами в "
 "будущем\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "�ельз� удал�ть по�ледний дей�твительный идентификатор пользовател�.\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5602,6 +5616,10 @@ msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "�е в�тавл�йте адре� �лектронной почты в им� пользовател� или примечание\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr "Такой идентификатор пользовател� на �том ключе уже е�ть!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5927,7 +5945,7 @@ msgstr "недопуÑ�тимый протокол Ñ�ервера ключей (Ð
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" - не идентификатор ключа: пропущен\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5935,47 +5953,47 @@ msgstr[0] "обновление %d ключа из %s\n"
 msgstr[1] "обновление %d ключей из %s\n"
 msgstr[2] "обновление %d ключей из %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "Внимание: невозможно обновить ключ %s � %s: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ключ \"%s\" на �ервере ключей не найден\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "ключ не найден на �ервере ключей\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "получение ключа %s � %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "не изве�тно ни одного �ервера ключей\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "пропущено \"%s\": %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "отправка ключа %s на %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "запро� ключа из '%s'\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Внимание: невозможно получить URI %s: %s\n"
@@ -6008,68 +6026,68 @@ msgstr "зашифровано неизве�тным алгоритмом %d\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "фраза-пароль �оздана � незнакомой хеш-функцией %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr "открытый ключ - %s\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "зашифровано %u-битным ключом %s � идентификатором %s, �озданным %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключом %s � идентификатором %s\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "Внимание: наблюдает�� не�колько тек�тов\n"
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано %lu фразами-парол�ми\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано одной фразой-паролем\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "�бой ра�шифровки � открытым ключом: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "данные зашифрованы открытым ключом: хороший DEK\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "предполагают�� данные, зашифрованные по %s\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "шифр IDEA недо�тупен, попробую вме�то него %s\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "Внимание: цело�тно�ть �ообщени� не защищена\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -6079,179 +6097,179 @@ msgstr ""
 "оно правомерно, по�кольку в те времена защита цело�тно�ти широко\n"
 "не примен�ла�ь.\n"
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "Во�пользуйте�ь параметром '%s', чтобы тем не менее ра�шифровать.\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "принудительный �бой ра�шифровки!\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "ра�шифровано нормально\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Внимание: зашифрованное �ообщение было изменено!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "�бой ра�шифровки: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "Замечание: отправитель запро�ил \"только между нами\"\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "первоначальное им� файла='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "отдельный �ертификат отзыва: задей�твует�� командой \"gpg --import\"\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, c-format
 msgid "no signature found\n"
 msgstr "подпи�ь не найдена\n"
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХ�Я подпи�ь пользовател� \"%s\""
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Про�роченна� подпи�ь пользовател� \"%s\""
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Дей�твительна� подпи�ь пользовател� \"%s\""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "проверка подпи�и подавлена\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "не могу обработать �ти неоднозначные данные подпи�и\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Подпи�ь �делана %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               ключом %s � идентификатором %s\n"
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпи�ь �делана %s ключом %s � идентификатором %s\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                издатель \"%s\"\n"
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Ключ до�тупен на: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "Замечание: Параметр '%s' включает и�пользование �той информации\n"
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[�омнительно]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                или \"%s\""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "Внимание: Данный ключ не подходит дл� подпи�и в режиме %s\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Подпи�ь про�рочена %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Подпи�ь дей�твительна до %s\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "формат подпи�и: %s, хеш-функци� %s%s%s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "двоичный"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "тек�товый"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "неизве�тно"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 msgid ", key algorithm "
 msgstr ", алгоритм ключа "
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "Внимание: не отделенна� подпи�ь; файл '%s' �Е был проверен!\n"
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�е могу проверить подпи�ь: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "не отделенна� подпи�ь\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "Внимание: обнаружено не�колько подпи�ей. Проверена будет только перва�.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "отдельна� подпи�ь кла��а 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "подпи�ь �тарого типа (PGP 2.x)\n"
@@ -6325,11 +6343,6 @@ msgstr "(дальнейшие �ведени�: "
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: параметр \"%s\" не рекомендует��\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "Внимание: параметр \"%s\" не рекомендует��\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7409,133 +7422,133 @@ msgstr "ошибка чтени� в '%s': %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "таблица довери�: �бой �инхронизации: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "не удает�� �оздать блокировку дл� '%s'\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "не удает�� заблокировать '%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "таблица довери�, запи�ь %lu: �бой lseek: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "таблица довери�, запи�ь %lu: �бой запи�и (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "�лишком больша� операци� над таблицей довери�\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: каталог не �уще�твует!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "нет до�тупа к '%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: �бой �оздани� запи�и о вер�ии: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: �оздана недопу�тима� таблица довери�\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: �оздана таблица довери�\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "Замечание: таблица довери� недо�тупна дл� запи�и\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: недопу�тима� таблица довери�\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: �бой �оздани� таблицы хешей: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: ошибка обновлени� запи�и о вер�ии: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: ошибка чтени� запи�и о вер�ии: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: ошибка �охранени� запи�и о вер�ии: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "таблица довери�: �бой lseek: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "таблица довери�: �бой чтени� (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: не �вл�ет�� файлом таблицы довери�\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: запи�ь о вер�ии � номером запи�и %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: неправильна� вер�и� файла %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: ошибка чтени� �вободной запи�и: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: ошибка �охранени� запи�и каталога: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: �бой обнулени� запи�и: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: �бой добавлени� запи�и: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Ошибка: таблица довери� повреждена.\n"
@@ -8196,16 +8209,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%s�омер: %s%%0AДержатель: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "О�тало�ь попыток: %d"
@@ -8246,10 +8259,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Функци� обработки PIN возвратила ошибку: %s\n"
@@ -8271,57 +8284,57 @@ msgstr "PIN длÑ� CHV%d Ñ�лишком короток, минимальнаÑ� Ð
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr "ключ уже �уще�твует\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "�уще�твующий ключ будет заменен\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr "генераци� нового ключа\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, c-format
 msgid "writing new key\n"
 msgstr "запи�ь нового ключа\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�бой �охранени� ключа: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "в ответе от�ут�твует модуль RSA\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "в ответе от�ут�твует открыта� �к�понента RSA\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "в ответе от�ут�твует открытый ключ �ллиптиче�кой кривой\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "пожалуй�та, подождите, пока будет генерировать�� ключ ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr "�бой при генерации ключа\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8329,63 +8342,63 @@ msgstr[0] "�оздание ключа завершено (%d �екунда)\n"
 msgstr[1] "�оздание ключа завершено (%d �екунды)\n"
 msgstr[2] "�оздание ключа завершено (%d �екунд)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "ответ не �одержит данных открытого ключа\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||Введите PIN ключа дл� �оздани� квалифицированных подпи�ей."
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Введите админи�тративный PIN"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Введите код разблокировки PIN (PUK) дл� �тандартных ключей."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 msgid "||Please enter the PIN for the standard keys."
 msgstr "|A|Введите PIN дл� �тандартных ключей."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Модули RSA пропущены, или их размер не равен %d бит\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "от�ут�твует открыта� �к�понента RSA, или ее размер превышает %d бит\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "пу�той PIN до �их пор не изменен\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "пу�той PIN до �их пор не изменен\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|A|Введите новый PIN дл� �тандартных ключей."
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|Введите новый код разблокировки PIN (PUK) дл� �тандартных ключей."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|Введите новый PIN ключа дл� �оздани� квалифицированных подпи�ей."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8393,7 +8406,7 @@ msgstr ""
 "|NP|Введите новый код разблокировки PIN (PUK) ключа дл� �оздани� "
 "квалифицированных подпи�ей."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8401,27 +8414,27 @@ msgstr ""
 "|P|Введите код разблокировки PIN (PUK) ключа дл� �оздани� квалифицированных "
 "подпи�ей."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "ошибка при получении нового PIN: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "�бой при �охранении отпечатка: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "�бой при �охранении даты �оздани�: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "ошибка получени� �тату�а CHV � карты\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "�бой при чтении открытого ключа: %s\n"
@@ -8429,44 +8442,44 @@ msgstr "�бой при чтении открытого ключа: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%s�омер: %s%%0AДержатель: %s%%0AСчетчик: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "о�новной PIN примен�ет�� как %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "не удало�ь применить о�новной PIN как %s: %s - далее примен�ть��\n"
 "как о�новной не будет\n"
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 msgid "||Please unlock the card"
 msgstr "||Разблокируйте карту"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN дл� CHV%d �лишком короток, минимальна� длина %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "�бой при проверке CHV%d: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "карта окончательно заблокирована!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8478,20 +8491,20 @@ msgstr[1] ""
 msgstr[2] ""
 "о�тало�ь %d попыток ввода админи�тративного PIN перед блокировкой карты\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "до�туп к командам управлени� не на�троен\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 msgid "||Please enter the PIN"
 msgstr "||Введите PIN"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Введите код �бро�а дл� карты"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Код �бро�а �лишком короток; минимальна� длина %d\n"
@@ -8499,79 +8512,79 @@ msgstr "Код Ñ�броÑ�а Ñ�лишком короток; минимальнаÑ
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr "|RN|�овый код �бро�а"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr "|AN|�овый админи�тративный PIN"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr "|N|�овый PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "|A|Введите админи�тративный PIN и новый админи�тративный PIN"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Введите PIN и новый PIN"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr "ошибка чтени� данных приложени�\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "ошибка чтени� отпечатка DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "пропущена метка времени �оздани�\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Про�тое чи�ло RSA %s пропущено или его размер не равен %d\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, c-format
 msgid "unsupported curve\n"
 msgstr "крива� не поддерживает��\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "недопу�тима� �труктура карты OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "отпечаток на карте не �овпадает � запрошенным\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "карта не поддерживает хеш-функцию %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "�оздано подпи�ей: %lu\n"
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "проверка админи�тративного PIN в данный момент запрещена �той командой\n"
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет до�тупа к %s - непригодна� карта OpenPGP?\n"
@@ -8591,7 +8604,7 @@ msgstr "|N|Первоначальный новый PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "работать в много�ерверном режиме (нефоновый режим)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|у�тановить уровень отладки, равный LEVEL"
 
@@ -8635,11 +8648,11 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "не позвол�ть и�пользовать админи�тративные команды карты"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Вызов: @SCDAEMON@ [параметры] (-h - под�казка)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8647,23 +8660,23 @@ msgstr ""
 "Синтак�и�: scdaemon [параметры] [команда [аргументы]]\n"
 "Демон криптографиче�ких карт дл� @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "и�пользуйте параметр '--daemon' дл� запу�ка приложени� в фоновом режиме\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "обработчик fd %d запущен\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "обработчик fd %d о�тановлен\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -8891,7 +8904,7 @@ msgstr "корневой Ñ�ертификат не помечен как довÐ
 msgid "checking the trust list failed: %s\n"
 msgstr "�бой проверки �пи�ка довери�: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "�лишком длинна� цепочка �ертификатов\n"
@@ -8948,7 +8961,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u-битный хеш недопу�тим дл� %u-битного ключа %s\n"
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
@@ -8993,42 +9006,42 @@ msgstr ""
 "S/N %s, идентификатор 0x%08lX,\n"
 "�оздан %s, и�текает %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "не задана применимо�ть ключа - подразумеваем в�е\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "�ертификат не �ледовало и�пользовать дл� заверени�\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "�ертификат не �ледовало и�пользовать дл� подпи�ывани� ответа OCSP\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "�ертификат не �ледовало и�пользовать дл� шифровани�\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "�ертификат не �ледовало и�пользовать дл� подпи�ей\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "�ертификат не пригоден дл� шифровани�\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "�ертификат не пригоден дл� подпи�и\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9217,6 +9230,11 @@ msgstr "Создать �амозаверенный �ертификат? (y/N)
 msgid "These parameters are used:\n"
 msgstr "И�пользуют�� параметры:\n"
 
+#: sm/certreqgen-ui.c:433
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "ошибка �оздани� временного файла: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr "Сейча� �оздает�� �амозаверенный �ертификат."
@@ -9289,123 +9307,123 @@ msgstr "�бой при удалении �ертификата \"%s\": %s\n"
 msgid "no valid recipients given\n"
 msgstr "не заданы получатели\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "list external keys"
 msgstr "выве�ти �пи�ок внешних ключей"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "list certificate chain"
 msgstr "выве�ти �пи�ок цепочек �ертификатов"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 msgid "import certificates"
 msgstr "импорт �ертификатов"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "export certificates"
 msgstr "�к�порт �ертификатов"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr "зареги�трировать криптографиче�кую карту"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr "передать команду dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr "вызываем gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "не и�пользовать терминал �ов�ем"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr "|N|чи�ло включаемых �ертификатов"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|вз�ть информацию о правилах из файла FILE"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr "предполагаю, что входные данные в формате PEM"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr "предполагаю, что входные данные в формате base64"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr "предполагаю, что входные данные в двоичном формате"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 msgid "create base-64 encoded output"
 msgstr "вывод в кодировке base64"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|и�пользовать USER-ID как о�новной �екретный ключ"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|добавить таблицу ключей в �пи�ок таблиц ключей"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr "запро�ить недо�тающих издателей �ертификатов"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|и�пользовать кодировку NAME дл� фраз-паролей PKCS#12"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr "не �вер�ть �о �пи�ком отозванных �ертификатов"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr "не провер�ть �пи�ки отозванных �ертификатов дл� корневых �ертификатов"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr "проверка до�товерно�ти � помощью OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr "не провер�ть правила �ертификата"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|и�пользовать алгоритм шифровани� NAME"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|и�пользовать хеш-функцию NAME"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "пакетный режим: ничего не �прашивать"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "прин�ть 'да' как ответ на большин�тво вопро�ов"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "прин�ть 'нет' как ответ на большин�тво вопро�ов"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|�охран�ть журнал аудита в файле FILE"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Вызов: @GPGSM@ [параметры] [файлы] (-h - под�казка)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9415,27 +9433,27 @@ msgstr ""
 "Подпи�ать, проверить, зашифровать или ра�шифровать по протоколу S/MIME\n"
 "Операци� по умолчанию зави�ит от входных данных\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "Замечание: не могу зашифровать дл� '%s': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "неизве�тна� �хема проверки '%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "импорт общих �ертификатов '%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "невозможно подпи�ать � помощью '%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "недопу�тима� команда (не�вной команды нет)\n"
@@ -9465,7 +9483,7 @@ msgstr "ошибка получениÑ� Ñ�охраненных признакоÐ
 msgid "error importing certificate: %s\n"
 msgstr "ошибка импорта �ертификата: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "ошибка чтени� ввода: %s\n"
@@ -9506,7 +9524,7 @@ msgstr "проблема повторного поиÑ�ка Ñ�ертификатÐ
 msgid "error storing flags: %s\n"
 msgstr "ошибка �охранени� признаков: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Ошибка - "
 
@@ -9882,11 +9900,6 @@ msgstr "невозможно �оздание временного файла '%
 msgid "error closing '%s': %s\n"
 msgstr "ошибка закрыти� '%s': %s\n"
 
-#: dirmngr/crlcache.c:948
-#, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "ошибка переименовани� '%s' в '%s': %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
@@ -10596,92 +10609,92 @@ msgstr "допу�тимые уровни отладки: %s\n"
 msgid "usage: %s [options] "
 msgstr "вызов: %s [параметры] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "двоеточи� в имени �окета недопу�тимы\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "�бой при получении �пи�ка отозванных �ертификатов из '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "�бой обработки �пи�ка отозванных �ертификатов из '%s': %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: �лишком длинна� �трока - пропущена\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: обнаружен неверный отпечаток\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: ошибка чтени�: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: му�ор в конце �троки игнорирует��\n"
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "получен SIGHUP - повторное чтение на�троек и запи�ь буферов на ди�к\n"
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "получен SIGUSR2 - дей�твие не определено\n"
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "получен SIGTERM - завершение работы ...\n"
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "получен SIGTERM - о�тало�ь %d активных �оединений\n"
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, c-format
 msgid "shutdown forced\n"
 msgstr "принудительное выключение\n"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "получен SIGINT - немедленное завершение работы\n"
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "получен �игнал %d - дей�твие не определено\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "ошибка чтени� '%s': �тату� HTTP %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL '%s' перенаправлен на '%s' (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "�лишком много перенаправлений\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "перенаправление изменило�ь на '%s'\n"
@@ -11047,57 +11060,57 @@ msgstr ""
 "�ертификат не �ледовало и�пользовать дл� подпи�ывани� �пи�ка отозванных "
 "�ертификатов\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "менее подробно"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr "выводить данные в ше�тнадцатеричном виде"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr "декодировать полученные �троки данных"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr "подключить�� к dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 #, fuzzy
 #| msgid "connect to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "подключить�� к dirmngr"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|подключить�� к �окету Assuan NAME"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|подключить�� к �ерверу Assuan по адре�у ADDR"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr "запу�тить �ервер Assuan, заданный в командной �троке"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr "не пользовать�� ра�ширенным режимом подключени�"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|выполнить при запу�ке команды из файла FILE"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr "выполнить при запу�ке под�тановку subst"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Вызов: @GPG@-connect-agent [параметры] (-h - под�казка)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -11105,49 +11118,49 @@ msgstr ""
 "Синтак�и�: @GPG@-connect-agent: [параметры]\n"
 "Св�зывает�� � запущенным агентом и по�ылает команды\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "параметр \"%s\" требует программы и необ�зательных аргументов\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "параметр \"%s\" игнорирует��; причина - \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "�бой получени� �троки: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "�лишком длинна� �трока - пропущена\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "�трока �окращена из-за �одержащего�� в ней нулевого �имвола\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "неизве�тна� команда '%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "�бой отправки �троки: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr "в �том �еан�е dirmngr не работает\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "ошибка отправки �тандартных параметров: %s\n"
@@ -11209,12 +11222,12 @@ msgstr "ВнешнÑ�Ñ� проверка компонента %s не прошлÐ
 msgid "Note that group specifications are ignored\n"
 msgstr "Обратите внимание, что �пецификации групп игнорируют��\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "ошибка закрыти� '%s'\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "ошибка при интерпретации '%s'\n"
@@ -11403,6 +11416,12 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "ошибка запи�и во временный файл: %s\n"
+
+#~ msgid "run in supervised mode"
+#~ msgstr "запу�к в подконтрольном режиме"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Им� не должно начинать�� � цифры\n"
 
@@ -11737,9 +11756,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "невозможно открыть %s на запи�ь: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "ошибка запи�и в %s: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "ошибка закрыти� %s: %s\n"
 
diff --git a/po/sk.po b/po/sk.po
index 4fe565f..80cd793 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
@@ -29,52 +29,52 @@ msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, fuzzy
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Skuto�ne chcete zmazať vybrané kľú�e? "
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "invalid passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "nesprávne heslo"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -85,28 +85,28 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 msgid "Passphrase Not Allowed"
 msgstr "heslo je príliš dlhé\n"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr ""
 
@@ -116,107 +116,107 @@ msgstr ""
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 #, fuzzy
 msgid "Passphrase:"
 msgstr "nesprávne heslo"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr ""
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 #, fuzzy
 msgid "PIN too long"
 msgstr "riadok je príliš dlhý\n"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "heslo je príliš dlhé\n"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatný znak ve mene\n"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad PIN"
 msgstr "nesprávne MPI"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "nesprávne heslo"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zmeniť heslo"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: agent/command.c:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -228,9 +228,9 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ochranný algoritmus %d%s nie je podporováný\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
@@ -238,15 +238,15 @@ msgstr "nemôžem vytvoriť `%s': %s\n"
 
 #: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -257,137 +257,128 @@ 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:2513
+#: agent/command-ssh.c:2467
 #, fuzzy, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
 "%s%%0Awithin gpg-agent's key storage"
 msgstr "Prosím, vložte heslo; toto je tajná veta \n"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr ""
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr ""
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr ""
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 #, fuzzy
 msgid "Repeat this Reset Code"
 msgstr "Opakujte heslo: "
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Opakujte heslo: "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 #, fuzzy
 msgid "Repeat this PIN"
 msgstr "Opakujte heslo: "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 #, fuzzy
 msgid "Reset Code not correctly repeated; try again"
 msgstr "heslo nie je zopakované správne; skúste to znovu"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "heslo nie je zopakované správne; skúste to znovu"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "heslo nie je zopakované správne; skúste to znovu"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, fuzzy, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "chyba pri vytváraní hesla: %s\n"
-
-#: agent/genkey.c:150
+#: agent/genkey.c:154
 #, fuzzy, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "zapisujem do '%s'\n"
+msgid "error writing to pipe: %s\n"
+msgstr "chyba pri zápise súboru kľú�ov (keyring)  `%s': %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 #, fuzzy
 msgid "Enter new passphrase"
 msgstr "Vložiť heslo\n"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr ""
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
 "confirm that you do not want to have any protection on your key."
 msgstr ""
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr ""
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -395,7 +386,7 @@ msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "Meno musí byť dlhé aspoň 5 znakov\n"
 msgstr[1] "Meno musí byť dlhé aspoň 5 znakov\n"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -403,242 +394,236 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr ""
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 #, fuzzy
 msgid "Take this one anyway"
 msgstr "Použiť napriek tomu tento kľú�? "
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, fuzzy, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr ""
 "Na ochranu Vášho tajného kľú�a musíte zadať heslo.\n"
 "\n"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 #, fuzzy
 msgid "Please enter the new passphrase"
 msgstr "zmeniť heslo"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 msgid "Options used for startup"
 msgstr ""
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-#, fuzzy
-#| msgid "Key is superseded"
-msgid "run in supervised mode"
-msgstr "Kľú� je nahradený"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr ""
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "s dodato�nými informáciami"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "byť o trochu tichší"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr ""
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizovať databázu dôvery"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|set terminal charset to NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|MENO|nastav znakovú sadu terminálu na MENO"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "not supported"
 msgid "enable ssh support"
 msgstr "nepodporované"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 #, fuzzy
 #| msgid "not supported"
 msgid "enable putty support"
 msgstr "nepodporované"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr ""
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 #, fuzzy
 msgid "disallow the use of an external password cache"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr ""
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr ""
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 #, fuzzy
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|použiť mód hesla N"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 #, fuzzy
 msgid "do not allow the reuse of old passphrases"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "Options controlling the PIN-Entry"
 msgstr ""
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 #, fuzzy
 #| msgid "use the gpg-agent"
 msgid "never use the PIN-entry"
 msgstr "použite gpg-agenta"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
@@ -646,145 +631,150 @@ 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:571
+#: agent/gpg-agent.c:570
 #, fuzzy
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
 msgstr ""
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "�ítam možnosti z `%s'\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, 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:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: nemôžem vytvoriť: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, fuzzy, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, fuzzy, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, 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:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, fuzzy, c-format
 msgid "listening on socket '%s'\n"
 msgstr "zapisujem tajný kľú� do `%s'\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, 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:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, fuzzy, c-format
 msgid "directory '%s' created\n"
 msgstr "%s: adresár vytvorený\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, 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:2385
+#: agent/gpg-agent.c:2395
 #, 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:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2832
+#: agent/gpg-agent.c:2842
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, 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:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: presko�ené: %s\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, fuzzy, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie je v tomto sedení dostupný\n"
@@ -810,7 +800,7 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -820,7 +810,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -874,42 +864,42 @@ msgstr "Zrušiť"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, fuzzy, c-format
 msgid "error opening '%s': %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "kľú� `%s' nebol nájdený: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "chyba pri �ítaní: %s\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "tajné �asti kľú�a nie sú dostupné\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "chyba pri �ítaní: %s\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "chyba: neplatný odtla�ok\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, fuzzy, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
@@ -922,19 +912,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr ""
@@ -947,7 +937,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -957,48 +947,63 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "chyba pri �ítaní `%s': %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr ""
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 #, fuzzy
 msgid "Change passphrase"
 msgstr "zmeniť heslo"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr ""
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1231
+#, c-format
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1741
 #, fuzzy, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
 "%%0A?"
 msgstr "Skuto�ne chcete zmazať vybrané kľú�e? "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 #, fuzzy
 msgid "Delete key"
 msgstr "nastaviť kľú� ako platný (enable)"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1020,7 +1025,7 @@ msgstr ""
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
@@ -1062,7 +1067,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
@@ -1124,12 +1129,12 @@ 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:905
+#: common/sysutils.c:880
 #, fuzzy, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "aktualizácia zlyhala: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, fuzzy, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
@@ -1357,7 +1362,7 @@ msgid "algorithm: %s"
 msgstr "ASCII kódovanie: %s\n"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, fuzzy, c-format
 msgid "unsupported algorithm: %s"
 msgstr ""
@@ -1528,7 +1533,7 @@ msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 msgid "iconv_open failed: %s\n"
 msgstr "nemožno otvoriť súbor: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
@@ -1567,7 +1572,7 @@ msgstr "verejný kľú� %08lX nebol nájdený: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "zapisujem tajný kľú� do `%s'\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
@@ -1742,7 +1747,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, fuzzy, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "gpg-agent nie je v tomto sedení dostupný\n"
@@ -1787,7 +1792,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "vytvoriť revoka�ný certifikát"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1815,7 +1820,7 @@ msgstr "nemožno previesť v dávkovom móde\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Tento príkaz nie je v módoch %s dovolený.\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, fuzzy, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "tajné �asti kľú�a nie sú dostupné\n"
@@ -1882,15 +1887,15 @@ msgstr "žiadny zodpovedajúci verejný kľú�: %s\n"
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
@@ -2238,27 +2243,27 @@ msgstr "zapisujem tajný kľú� do `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatný príkaz (skúste \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento príkaz nefunguje\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "nemožno otvoriť `%s'\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kľú� `%s' nebol nájdený: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 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,8 +2326,8 @@ msgid "subkey"
 msgstr "Verejné kľú�e: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizácia zlyhala: %s\n"
@@ -2385,14 +2390,14 @@ msgstr "nemôžete použiť šifrovací algoritmus \"%s\" v móde %s\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, fuzzy, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "nemôžete použiť šifrovací algoritmus \"%s\" v móde %s\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2414,7 +2419,7 @@ msgstr "vyžiadaná symetrická šifra %s (%d) nevyhovuje predvoľbám príjemcu
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "VAROV�N�: použitie parametra \"%s\" sa neodporú�a\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2527,12 +2532,12 @@ msgstr "zapisujem tajný kľú� do `%s'\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "kľú� %08lX: PGP 2.x kľú� - presko�ené\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "VAROVANIE: ni� nebolo vyexportované\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, fuzzy, c-format
 #| msgid "error creating `%s': %s\n"
@@ -2603,301 +2608,301 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, fuzzy, c-format
 msgid "valid values for option '%s':\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 #, fuzzy
 msgid "make a signature"
 msgstr "vytvoriť podpis oddelený od dokumentu"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[súbor]|vytvoriť podpis v �itateľnom dokumente"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "vytvoriť podpis oddelený od dokumentu"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "šifrovať dáta"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "Å¡ifrovanie len so symetrickou Å¡ifrou"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "dešifrovať dáta (implicitne)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "verifikovať podpis"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "vypísať zoznam kľú�ov"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "vypísať zoznam kľú�ov a podpisov"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "skontrolovať podpisy kľú�ov"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "vypísať zoznam kľú�ov a fingerprintov"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "vypísať zoznam tajných kľú�ov"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "vytvoriť revoka�ný certifikát"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 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:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "odstrániť kľú� zo súboru tajných kľú�ov"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "podpísať kľú�"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "podpísať kľú� lokálne"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "podpísať kľú�"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "podpísať kľú� lokálne"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "podpísať alebo modifikovať kľú�"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zmeniť heslo"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "exportovať kľú�e"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "exportovať kľú�e na server kľú�ov"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "importovať kľú�e zo servera kľú�ov"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "vyhľadať kľú�e na serveri kľú�ov"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "aktualizovať všetky kľú�e zo servera kľú�ov"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "importovať/zlú�iť kľú�e"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "aktualizovať databázu dôvery"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 #, fuzzy
 msgid "print message digests"
 msgstr "|algo [súbory]|vypíš hash"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|MENO|použi MENO ako implicitný tajný kľú�"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 #, fuzzy
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|MENO|šifrovať pre MENO"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr ""
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "nevykonať žiadne zmeny"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "vyžiadať potvrdenie pred prepísaním"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr ""
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr ""
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "vytvor výstup zakódovaný pomocou ASCII"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 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:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "použiť kánonický textový mód"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 #, fuzzy
 msgid "|N|set compress level to N (0 disables)"
 msgstr ""
 "|N|nastaviť úroveň komprimácie N (0 - žiadna\n"
 " komprimácia)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr ""
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importovať kľú�e zo servera kľú�ov"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 msgid "include the public key in signatures"
 msgstr "skontrolovať podpisy kľú�ov"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr ""
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr ""
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "vypísať zoznam tajných kľú�ov"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|MENO|šifrovať pre MENO"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "použiť toto id užívateľa na podpísanie\n"
 " alebo dešifrovanie"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2906,7 +2911,7 @@ msgstr ""
 "(Použite manuálové stránky pre kompletný zoznam všetkých príkazov a "
 "možností)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2936,13 +2941,13 @@ msgstr ""
 " --list-keys [mená]        vypísať kľú�e\n"
 " --fingerprint [mená]      vypísať fingerprinty\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -2957,7 +2962,7 @@ msgstr ""
 "podpísať, overiť, šifrovať alebo dešifrovať\n"
 "implicitné operácie závisia od vstupných dát\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2965,578 +2970,578 @@ msgstr ""
 "\n"
 "Podporované algoritmy:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Verejné kľú�e: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Å ifry: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, fuzzy, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "použitie: gpg [možnosti] "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "konfliktné príkazy\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, fuzzy, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = podpis nájdený v definícii skupiny \"%s\"\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "VAROVANIE: vlastníctvo pre %s nastavené nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "VAROVANIE: prístupové práva pre %s nie sú nastavené bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "VAROVANIE: vlastníctvo adresára %s nastavené nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "VAROVANIE: vlastníctvo adresára %s nastavené nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "VAROVANIE: vlastníctvo adresára %s nastavené nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "VAROVANIE: prístupové práva adresára %s nie sú nastavené bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr ""
 "VAROVANIE: prístupové práva adresára %s nie sú nastavené bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "VAROVANIE: prístupové práva adresára %s nie sú nastavené bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, fuzzy, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "neznáma položka konfigurácie \"%s\"\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, fuzzy
 msgid "show key usage information during key listings"
 msgstr "V súbore tajných kľú�ov chýba zodpovedajúci podpis\n"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V súbore tajných kľú�ov chýba zodpovedajúci podpis\n"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "ukáž v ktorom súbore kľú�ov je vypísaný kľú�"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V súbore tajných kľú�ov chýba zodpovedajúci podpis\n"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, fuzzy, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento príkaz nie je v módoch %s dovolený.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nie je pre normálne použitie!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, fuzzy, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "Neplatná e-mailová adresa\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, fuzzy, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, fuzzy, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, fuzzy, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "nemožno použiť URI servera kľú�ov - chyba analýzy URI\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, fuzzy, c-format
 msgid "invalid keyserver options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatný parameter pre import\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, fuzzy, c-format
 msgid "invalid filter option: %s\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatný parameter pre import\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, fuzzy, c-format
 msgid "invalid list options\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, fuzzy, c-format
 msgid "invalid verify options\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemožno nastaviť exec-path na %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatný parameter pre export\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "neplatný parameter pre import\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program môže vytvoriť súbor core!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prepíše %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolené používať %s s %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedáva s %s zmysel!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajný kľú� do `%s'\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, fuzzy, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "položka completes-needed musí byť vä�šia ako 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "položka marginals-needed musí byť vä�šia ako 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, fuzzy, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "položka max-cert-depth musí byť v rozmedzí od 1 do 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "neplatná implicitná úroveň certifikácie; musí byť 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "neplatná minimálna úroveň certifikácie; musí byť 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduchý mód S2K (0) je dôrazne nedoporu�ovaný\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatný mód S2K; musí byť 0, 1 alebo 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "neplatné defaultné predvoľby\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatné užívateľské predvoľby pre šifrovanie\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "neplatné užívateľské predvoľby pre šifrovanie\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "neplatné užívateľské predvoľby pre hashovanie\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "neplatné užívateľské predvoľby pre kompresiu\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "neplatná dĺžka kľú�a; použijem %u bitov\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ešte nepracuje s %s\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "nemôžete použiť šifrovací algoritmus \"%s\" v móde %s\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, fuzzy, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "nemôžete použiť kompresný algoritmus \"%s\" v móde %s\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVANIE: daný adresát (-r) bez použitia šifrovania s verejným kľú�om\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, fuzzy, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "dešifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr ""
 "použitie %s nie je v móde %s dovolené\n"
 "\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 "použitie %s nie je v móde %s dovolené\n"
 "\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo poslať kľú� na server: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prijať kľú� zo servera: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export kľú�a: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "nepodaril sa export kľú�a: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa nájsť server: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualizácia servera zlyhala: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódovanie z ASCII formátu zlyhalo: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "neplatný hashovací algoritmus `%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, fuzzy, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite písať svoju správu ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadané URL pre certifika�nú politiku je neplatné\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, fuzzy, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadané URL pre podpisovú politiku je neplatné\n"
@@ -3550,7 +3555,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapísať informácie o stave do tohto FD"
 
@@ -4279,7 +4284,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ste si istý, že stále chcete podpísať tento kľú�? (a/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  Nemožno podpísať.\n"
 
@@ -4482,8 +4487,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podpísať? "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
@@ -4697,7 +4702,7 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "Kľú� revokovaný."
 
@@ -4750,7 +4755,7 @@ msgstr "Skuto�ne odstrániť toto id užívateľa? "
 msgid "Really move the primary key? (y/N) "
 msgstr "Skuto�ne odstrániť toto id užívateľa? "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Musíte vybrať aspoň jeden kľú�.\n"
@@ -4837,169 +4842,169 @@ msgstr "Uložiť zmeny? "
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�iť bez uloženia? "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "kľú� nebol zmenený, takže nie je potrebné ho aktualizovať.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "Nemôžete zmazať posledné id užívateľa!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, fuzzy, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, fuzzy, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, fuzzy, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "chyba: neplatný odtla�ok\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, fuzzy, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "neplatná hodnota\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Takýto identifikátor užívateľa neexistuje.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 msgid "Nothing to sign.\n"
 msgstr "Ni� na podpísanie kľú�om %08lX\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, fuzzy, c-format
 msgid "Not signed by you.\n"
 msgstr "   podpísané %08lX v %s%s\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "%s nie je platná znaková sada\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "chyba: neplatný odtla�ok\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, fuzzy, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "kľú� `%s' nebol nájdený: %s\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 #, fuzzy
 msgid "Notations: "
 msgstr "Notácie: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Užívateľské ID vo formáte PGP 2.x nemá žiadne predvoľby\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Tento kľú� môže byť revokovaný kľú�om %s "
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento kľú� môže byť revokovaný kľú�om %s "
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citlivá informácia)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nemôžem vytvoriť: %s\n"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokované]"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnosť skon�í: %s]"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnosť skon�í: %s]"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " dôvera: %c/%c"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " dôvera: %c/%c"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Tento kľú� bol ozna�ený za neplatný (disabled)"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5007,19 +5012,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 #, fuzzy
 msgid "revoked"
 msgstr "[revokované]"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5028,18 +5033,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:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Nemôžete zmeniť dobu platnosti kľú�a verzie 3\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5048,35 +5053,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ste si istý, že ho chcete stále pridať? (a/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nemali by ste pridávať fotografické ID k PGP2 kľú�u.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmazať tento dobrý podpis? (a/N/u)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmazať tento neplatný podpis? (a/N/u)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmazať tento neznámy podpis? (a/N/u)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmazať tento podpis podpísaný sebou samým? (a/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5084,38 +5089,38 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Zmazaný %d podpis.\n"
 msgstr[1] "Zmazaný %d podpis.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznané.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 #, fuzzy
 msgid "invalid"
 msgstr "neplatný spôsob reprezentácie v ASCII"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Užívateľské ID \"%s\" je revokované."
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5124,221 +5129,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:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nemali by ste pridávať fotografické ID k PGP2 kľú�u.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vložte identifikátor užívateľa povereného revokáciou: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "kľú� vo formáte PGP 2.x nemožno poveriť revokáciou\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "kľú� nemožno poveriť revokáciou ním samým\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, fuzzy, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROVANIE: Tento kľú� bol revokovaný jeho ur�eným revokátorom/!\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROVANIE: ozna�enie kľú�a ako revokovací už nemôže byť zrušené!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Ste si istý, že chcete ozna�iť tento kľú� ako revokovací? (a/N): "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 #, fuzzy
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "Ste si istý, že chcete ozna�iť tento kľú� ako revokovací? (a/N): "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Mením dobu platnosti sekundárneho kľú�a.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Mením dobu platnosti primárneho kľú�a.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nemôžete zmeniť dobu platnosti kľú�a verzie 3\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 #, fuzzy
 msgid "Changing usage of a subkey.\n"
 msgstr "Mením dobu platnosti sekundárneho kľú�a.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Mením dobu platnosti primárneho kľú�a.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROVANIE: podpisovací podkľú� %08lX nie je krížovo certifikovaný\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosím, vyberte práve jedno id užívateľa.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "presko�ený v3 podpis kľú�a ním samým u užívateľského id \"%s\"\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ste si istý, že ho chcete použiť? (a/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ste si istý, že ho chcete použiť? (a/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podpisová notácia: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Prepísať (a/N)? "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, fuzzy, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifikátor užívateľa s indexom %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id užívateľa: \""
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   podpísané %08lX v %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (nexeportovateľné)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnosť podpisu vyprší %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ste si istý, že ho chcete stále revokovať? (a/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvoriť pre tento podpis revoka�ný certifikát? (a/N)"
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podpísali ste nasledujúce identifikátory užívateľa:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovateľné)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokované %08lX v %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chystáte sa revokovať tieto podpisy:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvoriť revoka�né certifikáty? (a/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "neexistuje tajný kľú�\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROVANIE: podpis použivateľkého ID vznikol %d sekund v budúcnosti\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Nemôžete zmazať posledné id užívateľa!\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "užívateľské ID \"%s\" je už revokované\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5767,6 +5772,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Do poľa meno alebo komentár nepíšte, prosím, e-mailovú adresu.\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -6097,56 +6106,56 @@ msgstr "neplatný parameter pre export\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "požadujem kľú� %08lX z %s\n"
 msgstr[1] "požadujem kľú� %08lX z %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROVANIE: nemôžem vymazať do�asný súbor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kľú� `%s' nebol nájdený: %s\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, fuzzy, c-format
 msgid "key not found on keyserver\n"
 msgstr "kľú� `%s' nebol nájdený: %s\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "požadujem kľú� %08lX z %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 msgid "no keyserver known\n"
 msgstr "neplatný parameter pre export\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, fuzzy, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "presko�ený `%s': %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podpísané Vaším kľú�om %08lX v %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 msgid "requesting key from '%s'\n"
 msgstr "požadujem kľú� %08lX z %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROVANIE: nemôžem vymazať do�asný súbor (%s) `%s': %s\n"
@@ -6179,258 +6188,258 @@ msgstr "zašifrované neznámym algoritmom %d\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "zašifrované neznámym algoritmom %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "verejný kľú� je %08lX\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "zašifrované %u-bitovým %s kľú�om, ID %08lX, vytvoreným %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zašifrovaná %s kľú�om, ID %08lX\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr ""
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zašifrované s %lu heslami\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "zašifrované jedným heslom\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dešifrovanie verejným kľú�om zlyhalo: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "dáta zašifrované verejným kľú�om: správny DEK\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "predpokladám %s šifrovaných dát\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "algoritmus IDEA nie je dostupný; optimisticky sa ho pokúsime nahradiť "
 "algoritmom %s\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROVANIE: správa nemá ochranu integrity\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dešifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "dešifrovanie o.k.\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVANIE: so zašifrovanou správou bolo manipulované!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dešifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odosielateľ požadoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pôvodné meno súboru='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatný revoka�ný certifikát -  použite \"gpg --import\", ak ho chcete "
 "využiť\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, fuzzy, c-format
 msgid "no signature found\n"
 msgstr "Dobrý podpis od \""
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ZL� podpis od \""
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypršanou platnosťou od \""
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobrý podpis od \""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "verifikácia podpisu potla�ená\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, fuzzy, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "neviem pracovať s týmito násobnými podpismi\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen muß "ID" rein :-(
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpis vytvorený %.*s pomocou %s kľú�a ID %08lX\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, fuzzy, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Kľú� k dispozícii na: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[neistý]  "
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "VAROVANIE: Tento kľú� nie certifikovaný dôveryhodným podpisom!\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnosť podpisu vypršala %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnosť podpisu vyprší %s\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s podpis, hashovací algoritmus %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "binárne"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "textový mód"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "neznáme"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 #, fuzzy
 #| msgid "unknown pubkey algorithm"
 msgid ", key algorithm "
 msgstr "neznámy algoritmus verejného kľú�a"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemôžem overiť podpis: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "toto nie je podpis oddelený od dokumentu\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "VAROVANIE: Nájdené viacnásobne podpisy. Skontrolovaný bude len prvý.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatný podpis triedy 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starého typu (PGP 2.x)\n"
@@ -6504,11 +6513,6 @@ msgstr ""
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: použitie parametra \"%s\" sa neodporú�a\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "VAROV�N�: použitie parametra \"%s\" sa neodporú�a\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7607,134 +7611,134 @@ msgstr "chyba pri �ítaní: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "databáza dôvery: synchronizácia zlyhala %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "nemôžem vytvoriť `%s': %s\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 msgid "can't lock '%s'\n"
 msgstr "nemožno otvoriť `%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "záznam v databáze dôvery %lu: lseek() sa nepodaril: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "záznam v databáze dôvery %lu: zápis sa nepodaril (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "transakcia s databázou dôvery je príliš dlhá\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: adresár neexistuje!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 msgid "can't access '%s': %s\n"
 msgstr "nemôžem zavrieť `%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: nepodarilo sa vytvoriť záznam verzie: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: vytvorená neplatná databáza dôvery\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: databáza dôvery vytvorená\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "POZN�MKA: do trustdb nemožno zapisovať\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: neplatná databáze dôvery\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: nepodarilo sa vytvoriť hashovaciu tabuľku: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: chyba pri aktualizácii záznamu verzie: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: chyba pri �ítaní záznamu verzie: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: chyba pri zápise záznamu verzie: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "databáze dôvery: procedúra lseek() zlyhala: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "databáza dôvery: procedúra read() (n=%d) zlyhala: %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: nie je súbor databázy dôvery\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: záznam verzie s �íslom %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: neplatná verzia súboru %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: chyba pri �ítaní voľného záznamu: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: chyba pri zápise adresárového záznamu: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: vynulovanie záznamu zlyhalo: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: pridanie záznamu zlyhalo: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: databáza dôvery vytvorená\n"
@@ -8357,16 +8361,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8401,10 +8405,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -8424,158 +8428,158 @@ msgstr ""
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, fuzzy, c-format
 msgid "key already exists\n"
 msgstr "`%s' je už skomprimovaný\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, fuzzy, c-format
 msgid "generating new key\n"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "vytvoriť nový pár kľú�ov"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, fuzzy, c-format
 #| msgid "remove keys from the public keyring"
 msgid "response does not contain the EC public key\n"
 msgstr "odstrániť kľú� zo súboru verejných kľú�ov"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, fuzzy, c-format
 msgid "generating key failed\n"
 msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, fuzzy, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "Vytvorenie kľú�a sa nepodarilo: %s\n"
 msgstr[1] "Vytvorenie kľú�a sa nepodarilo: %s\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "zmeniť heslo"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Prosím výberte dôvod na revokáciu:\n"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "zmeniť heslo"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "Note: This key has been disabled.\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "Poznámka: Tento kľú� bol ozna�ený ako neplatný (disabled).\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "zmeniť heslo"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Prosím výberte dôvod na revokáciu:\n"
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, fuzzy, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "nemôžem inicializovať databázu dôvery: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, fuzzy, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "zlyhalo obnovenie vyrovnávacej pamäti kľú�ov: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, fuzzy, c-format
 msgid "reading public key failed: %s\n"
 msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
@@ -8583,43 +8587,43 @@ msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 #, fuzzy
 msgid "||Please unlock the card"
 msgstr "zmeniť heslo"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo poslať kľú� na server: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8627,22 +8631,22 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "zmeniť heslo"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Prosím výberte dôvod na revokáciu:\n"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
@@ -8650,81 +8654,81 @@ msgstr ""
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "zmeniť heslo"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 #, fuzzy
 msgid "||Please enter the PIN and New PIN"
 msgstr "zmeniť heslo"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, fuzzy, c-format
 msgid "error reading application data\n"
 msgstr "chyba pri �ítaní bloku kľú�a: %s\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, fuzzy, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "%s: chyba pri �ítaní voľného záznamu: %s\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, fuzzy, c-format
 #| msgid "unsupported URI"
 msgid "unsupported curve\n"
 msgstr "toto URI nie je podporované"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s podpis, hashovací algoritmus %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenájdené žiadne platné dáta vo formáte OpenPGP.\n"
@@ -8745,7 +8749,7 @@ msgstr ""
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
@@ -8794,33 +8798,33 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "konfliktné príkazy\n"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
 msgstr ""
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr ""
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr ""
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, fuzzy, c-format
 msgid "error getting key usage information: %s\n"
@@ -9054,7 +9058,7 @@ msgstr ""
 msgid "checking the trust list failed: %s\n"
 msgstr "kontrola vytvoreného podpisu sa nepodarila: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr ""
@@ -9109,7 +9113,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr ""
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, fuzzy, c-format
 msgid "out of core\n"
@@ -9156,42 +9160,42 @@ msgstr ""
 "\"%.*s\"\n"
 "kľú� s dĺžkou %u bitov, typ %s, ID %08lX, vytvorený %s%s\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr ""
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr ""
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr ""
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr ""
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr ""
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr ""
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 msgid "looking for another certificate\n"
 msgstr "nesprávny certifikát"
@@ -9385,6 +9389,11 @@ msgstr "Vytvoriť pre tento podpis revoka�ný certifikát? "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:433
+#, fuzzy, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "chyba pri vytváraní hesla: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr ""
@@ -9459,136 +9468,136 @@ msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
 msgid "no valid recipients given\n"
 msgstr "(Žiadny popis)\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 #, fuzzy
 msgid "list external keys"
 msgstr "vypísať zoznam tajných kľú�ov"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 #, fuzzy
 msgid "list certificate chain"
 msgstr "nesprávny certifikát"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 #, fuzzy
 msgid "import certificates"
 msgstr "nesprávny certifikát"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 #, fuzzy
 msgid "export certificates"
 msgstr "nesprávny certifikát"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "vôbec nepoužívať terminál"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "vytvor výstup zakódovaný pomocou ASCII"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|MENO|použi MENO ako implicitný tajný kľú�"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr ""
 "pridať tento súbor kľú�ov do zoznamu\n"
 " používaných súborov kľú�ov"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 #, fuzzy
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|ALG|použiť šifrovací algoritmus ALG pre heslá"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr ""
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ALG|použiť šifrovací algoritmus ALG"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ALG|použiť hashovací algoritmus ALG"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "dávkový režim: nikdy sa na ni� nepýtať"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "automaticky odpovedať áno na vä�šinu otázok"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "automaticky odpovedať NIE na vä�šinu otázok"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 #, fuzzy
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
@@ -9599,27 +9608,27 @@ msgstr ""
 "podpísať, overiť, šifrovať alebo dešifrovať\n"
 "implicitné operácie závisia od vstupných dát\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, fuzzy, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "nemôžem sa pripojiť k `%s': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, fuzzy, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, fuzzy, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, fuzzy, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "nemôžem zavrieť `%s': %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
@@ -9649,7 +9658,7 @@ msgstr "chyba pri vytváraní hesla: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "chyba pri vytváraní hesla: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
@@ -9689,7 +9698,7 @@ msgstr "rev? problém overenia revokácie: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr ""
 
@@ -10057,12 +10066,6 @@ msgstr "nemôžem vytvoriť adresár `%s': %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: dirmngr/crlcache.c:948
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "chyba pri �ítaní `%s': %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 msgid "can't hash '%s': %s\n"
@@ -10753,93 +10756,93 @@ msgstr ""
 msgid "usage: %s [options] "
 msgstr "použitie: gpg [možnosti] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "Nie je dovolené používať %s s %s!\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, fuzzy, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, fuzzy, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "kódovanie do ASCII formátu zlyhalo: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, fuzzy, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "riadok je príliš dlhý\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, fuzzy, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "chyba: neplatný odtla�ok\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "chyba pri �ítaní: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, fuzzy, c-format
 msgid "shutdown forced\n"
 msgstr "nespracované"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 msgid "too many redirections\n"
 msgstr "príliš veľa `%c' predvolieb\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11210,105 +11213,105 @@ msgstr "duplicita predvoľby %c%lu\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 #, fuzzy
 msgid "quiet"
 msgstr "ukon�iť"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "connect to the keyboxd"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 #, fuzzy
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|SÚBOR|nahrať rozširujúci modul SÚBOR"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 #, fuzzy
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Použitie: gpg [možnosti] [súbory] (-h pre pomoc)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, fuzzy, c-format
 msgid "receiving line failed: %s\n"
 msgstr "zmazanie bloku kľú�a sa nepodarilo:  %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, fuzzy, c-format
 msgid "line too long - skipped\n"
 msgstr "riadok je príliš dlhý\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, fuzzy, c-format
 msgid "unknown command '%s'\n"
 msgstr "neznámy implicitný adresát `%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, fuzzy, c-format
 msgid "sending line failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "gpg-agent nie je v tomto sedení dostupný\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, fuzzy, c-format
 msgid "error sending standard options: %s\n"
 msgstr "chyba pri posielaní na `%s': %s\n"
@@ -11374,12 +11377,12 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 msgid "error closing '%s'\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 msgid "error parsing '%s'\n"
 msgstr "chyba pri �ítaní `%s': %s\n"
@@ -11569,6 +11572,15 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#, fuzzy
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "zapisujem do '%s'\n"
+
+#, fuzzy
+#~| msgid "Key is superseded"
+#~ msgid "run in supervised mode"
+#~ msgstr "Kľú� je nahradený"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Meno nemôže za�ínať �íslicou\n"
 
@@ -11832,10 +11844,6 @@ msgstr ""
 #~ msgstr "nemožno otvoriť %s: %s\n"
 
 #, fuzzy
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "chyba pri zápise súboru kľú�ov (keyring)  `%s': %s\n"
-
-#, fuzzy
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "chyba pri �ítaní `%s': %s\n"
 
diff --git a/po/sv.gmo b/po/sv.gmo
index 3fab4be..6041799 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 76a0f21..559b8b1 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2017-11-02 17:41+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -34,7 +34,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "misslyckades med att ta kontroll över PIN-inmatningslåset: %s\n"
@@ -45,59 +45,59 @@ msgstr "misslyckades med att ta kontroll över PIN-inmatningslåset: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "_Avbryt"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_Yes"
 msgstr "_OK"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_No"
 msgstr "_OK"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "PIN-kod:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 #| msgid "|pinentry-label|_Cancel"
 msgid "|pinentry-label|_Save in password manager"
 msgstr "_Avbryt"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "Enter new passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "Ange ny lösenfras"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -108,7 +108,7 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -122,14 +122,14 @@ msgstr ""
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -137,7 +137,7 @@ msgstr "Lösenfrasen är för lång"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -147,7 +147,7 @@ msgstr "Kvalitet:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Denna rad indikerar kvaliteten för ovan angiven lösenfras.\n"
@@ -156,7 +156,7 @@ msgstr ""
 "och specialtecken. Fråga din administratör om mer exakt information hur\n"
 "man anger säkra lösenfraser."
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -164,84 +164,84 @@ msgstr ""
 "Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här "
 "sessionen"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 "Ange din lösenfras så att den hemliga nyckeln kan låsas upp för denna session"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Lösenfras:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "stämmer inte överens - försök igen"
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (försök %d av %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 msgid "PIN too long"
 msgstr "PIN-koden är för lång"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 msgid "Passphrase too long"
 msgstr "Lösenfrasen är för lång"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 msgid "Invalid characters in PIN"
 msgstr "Ogiltiga tecken i PIN-kod"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr "PIN-kod för kort"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad PIN"
 msgstr "Felaktig PIN-kod"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Ange denna lösenfras igen"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, 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:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -266,9 +266,9 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "ssh-nycklar större än %d bitar stöds inte\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
@@ -276,15 +276,15 @@ msgstr "kan inte skapa \"%s\": %s\n"
 
 #: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, 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:2513
+#: agent/command-ssh.c:2467
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting list of cards: %s\n"
 msgstr "fel vid hämtning av lagrade flaggor: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Ange lösenfrasen för ssh-nyckeln%0A  %c"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -330,89 +330,81 @@ msgstr ""
 "Ange en lösenfras för att skydda den mottagna hemliga nyckeln%%0A   %s%%0Ai  "
 "gpg-agents nyckellager"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "misslyckades med att skapa flöde från uttag: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Mata in kortet med serienummer"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "Admin PIN-kod"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK-kod"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Nollställ kod"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's keypad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0AAnvänd läsarens knappsats för inmatning."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Upprepa denna nollställningskod"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Upprepa denna PUK-kod"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Upprepa denna PIN-kod"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Nollställningskoden repeterades inte korrekt; försök igen"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK-koden repeterades inte korrekt; försök igen"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-kod repeterades inte korrekt; försök igen"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "fel när temporärfil skapades: %s\n"
-
-#: agent/genkey.c:150
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "fel vid skrivning till temporärfil: %s\n"
+#: agent/genkey.c:154
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "fel vid skrivning till %s: %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 msgid "Enter new passphrase"
 msgstr "Ange ny lösenfras"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "Du har inte angivit en lösenfras!%0AEn tom lösenfras tillåts inte."
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -421,11 +413,11 @@ msgstr ""
 "Du har inte angivet en lösenfras - det här är oftast en dålig idé!"
 "%0ABekräfta att du inte vill ha något som helst skydd för din nyckel."
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr "Ja, skydd behövs inte"
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -433,7 +425,7 @@ msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "Namnet måste vara åtminstone 5 tecken långt\n"
 msgstr[1] "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -451,7 +443,7 @@ msgstr[1] ""
 "Varning:  Du har angivit en lösenfras som inte är säker.%%0AEn lösenfras ska "
 "innehålla minst %u tecken eller%%0Aspecialtecken."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase may not "
@@ -461,7 +453,7 @@ msgstr ""
 "Varning:  Du har angivit en lösenfras som inte är säker.%%0AEn lösenfras får "
 "inte vara ett känd ord eller matcha%%0Avissa mönster."
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 #, fuzzy
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -474,249 +466,243 @@ msgstr ""
 "Varning:  Du har angivit en lösenfras som inte är säker.%%0AEn lösenfras ska "
 "vara minst %u tecken lång."
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 msgid "Take this one anyway"
 msgstr "Ta den här ändå"
 
 # fel kapitalisering i originalet?
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, fuzzy, c-format
 #| msgid "Please enter the passphrase to%0Ato protect your new key"
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Ange lösenfrasen för%0Aför att skydda din nya nyckel"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 msgid "Please enter the new passphrase"
 msgstr "Ange den nya lösenfrasen"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Flaggor användbara för felsökning"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr "kör i demonläge (bakgrund)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-#, fuzzy
-#| msgid "run in server mode"
-msgid "run in supervised mode"
-msgstr "kör i serverläge"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr "frigör inte från konsollen"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr "sh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr "csh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr "Flaggor som kontrollerar diagnosutdata"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "utförlig"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FIL|skriv serverlägesloggar till FIL"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr "Flaggor som kontrollerar konfigurationen"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "använd inte SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PRG|använd PRG som SCdaemon-programmet"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PRG|använd PRG som SCdaemon-programmet"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|connect to Assuan socket NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAMN|anslut till Assuan-uttaget NAMN"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ignorera begäran om att ändra TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ignorera begäran om att ändra X-display"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "aktivera ssh-agent-emulering"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr ""
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 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:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|låt mellanlagrade PIN-koder gå ut efter N sekunder"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|låt mellanlagrade SSH-nycklar gå ut efter N sekunder"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|ställ in maximal livstid för PIN-cache till N sekunder"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|ställ in maximal livstid för SSH-nyckel till N sekunder"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr "använd inte mellanlagring av PIN-kod vid signering"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 #, fuzzy
 #| msgid "do not allow the reuse of old passphrases"
 msgid "disallow the use of an external password cache"
 msgstr "tillåt inte återanvändning av gamla lösenfraser"
 
 # Antar att värdet inte ska översättas.
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 #, fuzzy
 #| msgid "allow clients to mark keys as \"trusted\""
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "tillåt klienter att markera nycklar som \"trusted\""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 msgid "allow presetting passphrase"
 msgstr "tillåt förinställning av lösenfras"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr "Flaggor som tvingar igenom en lösenfraspolicy"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr "tillåt inte att gå förbi lösenfraspolicyn"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|ställ in minimal nödvändig längd för nya lösenfraser till N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|kräv minst N icke-alfabetiska tecken för en ny lösenfras"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FIL|kontrollera nya lösenfraser mot mönster i FIL"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|låt mellanlagrad lösenfras gå ut efter N dagar"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 msgid "do not allow the reuse of old passphrases"
 msgstr "tillåt inte återanvändning av gamla lösenfraser"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Flaggor som kontrollerar säkerheten"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "fånga inte tangentbord och mus"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 #, fuzzy
 #| msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|ställ in maximal livstid för PIN-cache till N sekunder"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Rapportera fel till <@EMAIL@>.\n"
 "Skicka synpunkter på översättningen till <tp-sv@listor.tp-sv.se>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -728,145 +714,150 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, fuzzy, c-format
 #| msgid "invalid debug-level `%s' given\n"
 msgid "invalid debug-level '%s' given\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, 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:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, 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:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, 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:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, 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:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, 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:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, 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:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: 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:2381
+#: agent/gpg-agent.c:2391
 #, 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:2385
+#: agent/gpg-agent.c:2395
 #, 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:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, 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:2747
+#: agent/gpg-agent.c:2757
 #, 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:2752
+#: agent/gpg-agent.c:2762
 #, 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:2827
+#: agent/gpg-agent.c:2837
 #, 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:2832
+#: agent/gpg-agent.c:2842
 #, 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:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, 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:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppad\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "ingen gpg-agent kör i den här sessionen\n"
@@ -894,7 +885,7 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
 "Underhåll av lösenordscache\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -905,7 +896,7 @@ msgstr ""
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -960,49 +951,49 @@ msgstr "avbruten\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fel vid fråga efter lösenfrasen: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening '%s': %s\n"
 msgstr "fel vid öppnandet av \"%s\": %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 #| msgid "file `%s', line %d: %s\n"
 msgid "file '%s', line %d: %s\n"
 msgstr "fil \"%s\", rad %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 #| msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "uttrycket \"%s\" ignorerat i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 #| msgid "system trustlist `%s' not available\n"
 msgid "system trustlist '%s' not available\n"
 msgstr "systemets tillitslista \"%s\" är inte tillgänglig\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 #| msgid "bad fingerprint in `%s', line %d\n"
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "felaktigt fingeravtryck i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 #| msgid "invalid keyflag in `%s', line %d\n"
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "ogiltig nyckelflagga i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, fuzzy, c-format
 #| msgid "error reading `%s', line %d: %s\n"
 msgid "error reading '%s', line %d: %s\n"
 msgstr "fel vid läsning av \"%s\", rad %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "fel vid inläsning av betrodda rotcertifikat\n"
@@ -1015,7 +1006,7 @@ msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -1024,11 +1015,11 @@ msgstr ""
 "Litar du förbehållslöst på%%0A  \"%s\"%%0Aatt korrekt certifiera "
 "användarcertifikat?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr "Nej"
@@ -1041,7 +1032,7 @@ msgstr "Nej"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -1053,22 +1044,28 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr "Korrekt"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr "Fel"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "fel vid läsning av \"%s\": %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Observera: Den här lösenfrasen har aldrig blivit ändrad.%0ADu bör ändra den "
 "nu."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -1077,15 +1074,24 @@ msgstr ""
 "Den här lösenfrasen har inte ändrats%%0Asedan %.4s-%.2s-%.2s.  Du bör ändra "
 "den nu."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 msgid "Change passphrase"
 msgstr "ändra lösenfras"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr "Jag ändrar den senare"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr "Mata in kortet med serienummer"
+
+#: agent/findkey.c:1231
+#, c-format
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1741
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -1093,13 +1099,13 @@ msgid ""
 "%%0A?"
 msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
 msgstr "aktivera nyckel"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1122,7 +1128,7 @@ msgstr "%s-nyckeln använder en osäker hash (%u bitar)\n"
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "en %u-bitars hash är inte giltig för en %u-bitars %s-nyckel\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "kontroll av den skapade signaturen misslyckades: %s\n"
@@ -1165,7 +1171,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "fel vid grening av process: %s\n"
@@ -1232,13 +1238,13 @@ 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:905
+#: common/sysutils.c:880
 #, fuzzy, c-format
 #| msgid "waiting %d seconds for the agent to come up\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "väntar %d sekunder för att agenten ska komma igång\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "renaming '%s' to '%s' failed: %s\n"
@@ -1465,7 +1471,7 @@ msgid "algorithm: %s"
 msgstr "algoritm: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "algoritmen stöds inte: %s"
@@ -1623,7 +1629,7 @@ msgstr "konvertering från \"%s\" till \"%s\" är inte tillgänglig\n"
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open misslyckades: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' failed: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
@@ -1666,7 +1672,7 @@ msgstr "låset \"%s\" gjordes inte: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "väntar på låset %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s är för gammal (behöver %s, har %s)\n"
@@ -1850,7 +1856,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
@@ -1896,7 +1902,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1924,7 +1930,7 @@ msgstr "kan inte göra detta i satsläge\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Detta kommando är endast tillgängligt för kort av version 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Återställningskoden är inte tillgänglig längre\n"
@@ -1989,15 +1995,15 @@ msgstr "Url för att hämta publik nyckel: "
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, fuzzy, c-format
 #| msgid "error writing `%s': %s\n"
@@ -2369,28 +2375,28 @@ msgstr "Administrationskommandon tillåts inte\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (prova med \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
 # se förra kommentaren
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "nyckeln \"%s\" hittades inte: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2453,8 +2459,8 @@ msgid "subkey"
 msgstr "Publik nyckel: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
@@ -2518,15 +2524,15 @@ msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, fuzzy, c-format
 #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2553,7 +2559,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "VARNING: \"%s\" är en föråldrad flagga - den har ingen effekt\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2663,12 +2669,12 @@ msgstr "export av hemliga nycklar tillåts inte\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "nyckeln %s: nyckel av PGP 2.x-typ - hoppade över\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: ingenting exporterat\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, fuzzy, c-format
 #| msgid "error creating `%s': %s\n"
@@ -2739,300 +2745,300 @@ 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:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
 msgstr "argument för flaggan \"%.50s\" saknas\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 msgid "make a signature"
 msgstr "skapa en signatur"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "make a clear text signature"
 msgstr "skapa en klartextsignatur"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering endast med symmetriskt chiffer"
 
 # gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "validera en signatur"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "lista nycklar"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "lista nycklar och signaturer"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "lista nycklar och fingeravtryck"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "lista hemliga nycklar"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den publika nyckelringen"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "ändra en lösenfras"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "importera/slå samman nycklar"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr "skriv ut kortstatus"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr "ändra data på ett kort"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr "ändra PIN-kod för ett kort"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid "print message digests"
 msgstr "skriv ut kontrollsummor"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "kör i serverläge"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAMN|kryptera även till användaridentiteten NAMN"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|ange e-postalias (ett eller flera)"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr "använd strikt OpenPGP-beteende"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "fråga innan överskrivning"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Flaggor som kontrollerar säkerheten"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Flaggor som kontrollerar diagnosutdata"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FIL|skriv utdata till FIL"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|ställ in komprimeringsnivån till N (0 för att inaktivera)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 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:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MEKANISMER|använd MEKANISMER för att hitta nycklar efter e-postadress"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "inaktivera all åtkomst till dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "Flaggor som kontrollerar konfigurationen"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "lista hemliga nycklar"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|ANVÄNDAR-ID|kryptera för ANVÄNDAR-ID"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|ANVÄNDAR-ID|använd ANVÄNDAR-ID för att signera eller dekryptera"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -3040,7 +3046,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -3070,14 +3076,14 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -3092,7 +3098,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -3100,85 +3106,85 @@ msgstr ""
 "\n"
 "Algoritmer som stöds:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Publik nyckel: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 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:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, fuzzy, c-format
 #| msgid "no = sign found in group definition `%s'\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "VARNING: osäkert ägarskap på hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "VARNING: osäkert ägarskap på konfigurationsfilen \"%s\"\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "VARNING: osäkert ägarskap på tillägget \"%s\"\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "VARNING: osäkra rättigheter på hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "VARNING: osäkra rättigheter på konfigurationsfilen \"%s\"\n"
 
 # Extension är vad? FIXME
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "VARNING: osäkra rättigheter på tillägget \"%s\"\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3188,21 +3194,21 @@ msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "VARNING: osäkert ägarskap på inneslutande katalog för tillägget \"%s\"\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för hemkatalogen \"%s\"\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3213,505 +3219,505 @@ msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för konfigurationsfilen "
 "\"%s\"\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "VARNING: osäkra rättigheter på inneslutande katalog för tillägget \"%s\"\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id under nyckellistning"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, fuzzy
 #| msgid "show user ID validity during key listings"
 msgid "show key usage information during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er under signaturlistningar"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer under signaturlistningar"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer under signaturlistningar"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer under signaturlistningar"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum under signaturlistningar"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "okänd flagga \"%s\"\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 #| msgid "line %d: not a valid email address\n"
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "rad %d: inte en giltig e-postadress\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 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:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 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:3314
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid character set\n"
 msgid "'%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id under signaturvalidering"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er under signaturvalidering"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer under signaturvalidering"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer under signaturvalidering"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer under signaturvalidering"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 msgid "show only the primary user ID in signature verification"
 msgstr "visa endast primär användaridentitet i signaturvalidering"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte ställa in exec-path till %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "argument för flaggan \"%.50s\" saknas\n"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "VARNING: kör med falsk systemtid: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kommer inte att köra med osäkert minne på grund av %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vald algoritm för certifieringssammandrag är felaktig\n"
 
 # antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
 
 # antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
 # Hur djupt GnuPG ska leta i Web-of-trust.
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth måste vara inom intervallet från 1 till 255\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "ogiltigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ogiltigt minimivärde för certifieringsnivån; måste vara 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "ogiltiga standardinställningar\n"
 
 # Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av personligt chiffer\n"
 
 # Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "ogiltig inställning av personligt chiffer\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, fuzzy, c-format
 #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr ""
 "du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, fuzzy, c-format
 #| msgid "symmetric encryption of `%s' failed: %s\n"
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "du kan inte använda --symmetric --encrypt i %s-läget\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --sign --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 "du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error parsing key specification '%s': %s\n"
 msgstr "fel vid lagring av certifikat: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
@@ -3727,7 +3733,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:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
@@ -4482,7 +4488,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Vill du verkligen fortfarande signera den? (j/N)"
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
 
@@ -4659,8 +4665,8 @@ msgstr "Jag har gjort en noggrann kontroll av denna nyckel.\n"
 msgid "Really sign? (y/N) "
 msgstr "Verkligen signera? (j/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
@@ -4876,7 +4882,7 @@ msgstr ""
 "signaturer\n"
 "  (nrsign), eller en kombination av dessa (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "Nyckeln är spärrad."
 
@@ -4927,7 +4933,7 @@ msgstr "Verkligen ta bort denna användaridentitet? (j/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Verkligen flytta den primära nyckeln? (j/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr "Du måste välja exakt en nyckel.\n"
 
@@ -5007,177 +5013,177 @@ msgstr "Spara ändringar? (j/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? (j/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "revoking the user ID failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "setting the primary user ID failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "ogiltigt fingeravtryck"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, fuzzy, c-format
 #| msgid "failed to get the fingerprint\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "misslyckades med att få fingeravtrycket\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "ogiltigt värde\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Ingen sådan användaridentitet.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 #| msgid "Nothing to sign with key %s\n"
 msgid "Nothing to sign.\n"
 msgstr "Det finns inget att signera med nyckeln %s\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "Inte signerad av dig.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "kontroll av den skapade signaturen misslyckades: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid expiration time\n"
 msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "ogiltigt fingeravtryck"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "nyckeln \"%s\" hittades inte: %s\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Sammandrag: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr "Nyckelserver no-modify"
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr "Föredragen nyckelserver: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Du kan inte ange några inställningar för en användaridentitet av PGP 2.x-"
 "typ.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Följande nyckel blev spärrad den %s av %s nyckel %s\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Den här nyckeln kan vara spärrad av %s nyckel %s"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr "(känsligt)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "skapat: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr "spärrad: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr "utgånget: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "går ut: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr "kortnummer: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr "giltighet: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5185,17 +5191,17 @@ msgstr ""
 "Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
 "såvida inte du startar om programmet.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr "spärrad"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "utgånget"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5205,18 +5211,18 @@ msgstr ""
 "Detta kommando kan göra att en annan användaridentitet antas\n"
 "vara den primära identiteten.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5225,36 +5231,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:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Vill du verkligen fortfarande lägga till den? (j/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan inte lägga till ett foto-id till en nyckel av PGP 2-typ.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "En sådan användaridentitet finns redan på denna nyckel!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Verkligen ta bort denna självsignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5262,20 +5270,20 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "Raderade %d signatur.\n"
 msgstr[1] "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "ogiltigt"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
@@ -5283,17 +5291,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:4467
+#: g10/keyedit.c:4523
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Användaridentitet \"%s\": redan minimerad\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Användaridentitet \"%s\": redan rensad\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5303,42 +5311,42 @@ msgstr ""
 "denna\n"
 "         nyckel inte användas i vissa versioner av PGP.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Du får inte lägga till en spärrnyckel för en PGP 2.x-nyckel.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användaridentiteten för spärrnyckeln: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "det går inte att använda en PGP 2.x-nyckel som spärrnyckel\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "du kan inte ange en nyckel som sin egen spärrnyckel\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "den här nyckeln har redan markerats som en spärrnyckel\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VARNING: det går aldrig att ångra om du utser en spärrnyckel!\n"
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 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:4721
+#: g10/keyedit.c:4777
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5348,183 +5356,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:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar utgångstid för en undernyckel.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "Ändrar utgångstid för en undernyckel.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
 # Vad betyder det?
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "undernyckeln %s signerar inte och behöver inte korscertifieras\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Välj endast en användaridentitet.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hoppar över v3-självsignatur på användaridentiteten \"%s\"\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr "Ange din föredragna nyckelserver-url: "
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Är du säker på att du vill ersätta det? (j/N) "
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Är du säker på att du vill ta bort det? (j/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 msgid "Enter the notation: "
 msgstr "Ange notationen: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 msgid "Proceed? (y/N) "
 msgstr "Fortsätt? (j/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med indexet %d\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen användaridentitet med hashen %s\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, fuzzy, c-format
 #| msgid "No subkey with index %d\n"
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Ingen undernyckel med indexet %d\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernyckel med indexet %d\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \"%s\"\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "signerat av din nyckel %s den %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Är du säker på att du fortfarande vill spärra den? (j/N)"
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)"
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Du har signerat följande användaridentiteter med nyckeln %s:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr " (inte spärrbar)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "spärrad av din nyckel %s den %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du är på väg att spärra dessa signaturer:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "användaridentiteten \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VARNING: en signatur på en användaridentitet är daterad %d sekunder in i "
 "framtiden\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, 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"
@@ -5969,6 +5977,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr "En sådan användaridentitet finns redan på denna nyckel!\n"
+
 # Ej solklart vad förkortningarna står för
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
@@ -6305,7 +6317,7 @@ msgstr "ogiltigt nyckelserverprotokoll (vi %d!=hanterare %d)\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" inte ett nyckel-id: hoppar över\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -6313,49 +6325,49 @@ msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "uppdaterar %d nycklar från %s\n"
 msgstr[1] "uppdaterar %d nycklar från %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VARNING: kunde inte uppdatera nyckeln %s via %s: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "nyckeln \"%s\" hittades inte på nyckelservern\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "nyckeln hittades inte på nyckelservern\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "begär nyckeln %s från %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 #| msgid "no keyserver action!\n"
 msgid "no keyserver known\n"
 msgstr "ingen nyckelserveråtgärd!\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "hoppade över \"%s\": %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "skickar nyckeln %s till %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 #| msgid "requesting key %s from %s\n"
 msgid "requesting key from '%s'\n"
 msgstr "begär nyckeln %s från %s\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VARNING: kunde inte hämta uri:n %s: %s\n"
@@ -6388,60 +6400,60 @@ msgstr "krypterad med en okänd algoritm %d\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "lösenfras genererad med okänd sammandragsalgoritm %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr "publik nyckel är %s\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "krypterad med %u-bitars %s-nyckel, id %s, skapad %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krypterad med %s-nyckel, id %s\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "VARNING: multipla klartexter har påträffats\n"
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypterad med %lu lösenfraser\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypterad med with 1 lösenfras\n"
 
 # Motsatsen till kryptering med symmetrisk nyckel.
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "dekryptering med publik nyckel misslyckades: %s\n"
 
 # Men jag ändrade så det blev närmare originalet. Per
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "Data krypterat med publik nyckel: korrekt DEK\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar att %s krypterade data\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
@@ -6449,191 +6461,191 @@ msgstr ""
 "istället\n"
 
 # Äldre krypteringalgoritmer skapar ingen mdc dvs. "minisignatur" som skyddar mot att delar av den krypterade texten byts ut/tas bort. Alla nya 128-bitars algoritmer använder mdc: AES, AES192, AES256, BLOWFISH.
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VARNING: detta meddelande var inte integritetsskyddat\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
 # Meddelandet innebär alltså att kontrollen av mdc visade att meddelandet förändrats/manipulerats sedan det krypterades. Block kan ha tagits bort eller bytts ut.
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "fristående spärrcertifikat - använd \"gpg --import\" för\n"
 "att verkställa\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, c-format
 msgid "no signature found\n"
 msgstr "ingen signatur hittades\n"
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \"%s\""
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Utgången signatur från \"%s\""
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekt signatur från \"%s\""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "signaturvalidering utlämnad\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "kan inte hantera detta tvetydliga signaturdata\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signatur gjord %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "             med %s-nyckeln %s\n"
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur gjordes %s med %s nyckel-id %s\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "      även känd som \"%s\""
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
 # Visas vid ogiltig signatur:
 # Eftersom signaturen är ogiltig kan man inte vara säker på att angivet namn och nyckel-id är riktigt.
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[osäkert]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr "      även känd som \"%s\""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "VARNING: Denna nyckel är inte certifierad med en pålitlig signatur!\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "binär"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "okänd"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 #, fuzzy
 #| msgid "algorithm: %s"
 msgid ", key algorithm "
 msgstr "algoritm: %s"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte kontrollera signaturen: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
@@ -6641,12 +6653,12 @@ msgstr ""
 "VARNING: multipla signaturer upptäckta. Endast den första kommer att "
 "kontrolleras.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
@@ -6721,11 +6733,6 @@ msgstr ""
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: flaggan är föråldrad \"%s\"\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7868,138 +7875,138 @@ msgstr "läsfel i \"%s\":  %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "tillitsdatabas: synkronisering misslyckades: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 #| msgid "can't create lock for `%s'\n"
 msgid "can't create lock for '%s'\n"
 msgstr "kan inte skapa lås för \"%s\"\n"
 
 # se förra kommentaren
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 #| msgid "can't lock `%s'\n"
 msgid "can't lock '%s'\n"
 msgstr "kan inte låsa \"%s\"\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "tillitsdatabasposten %lu: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "tillitsdatabasposten %lu: skrivning misslyckades (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "tillitsdatabastransaktion för stor\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalogen finns inte!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't access '%s': %s\n"
 msgstr "kan inte komma åt \"%s\": %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: misslyckades med att skapa versionspost: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ogiltig tillitsdatabas skapad\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: tillitsdatabas skapad\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "OBS: det går inte att skriva till tillitsdatabasen\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ogiltig tillitsdatabas\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: misslyckades med att skapa kontrollsummetabell: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: fel vid uppdatering av versionspost: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: fel vid läsning av versionspost: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: fel vid skrivning av versionspost: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "tillitsdatabas: lseek misslyckades: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "tillitsdatabas: läsning misslyckades (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: detta är inte en tillitsdatabasfil\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: versionspost med postnummer %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: ogiltig filversion %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: fel vid läsning av ledig post: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: fel vid läsning av katalogpost: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: misslyckades med att nollställa en post: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: misslyckades med att lägga till en post: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Fel: Tillitsdatabasen är skadad.\n"
@@ -8661,16 +8668,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8711,10 +8718,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-Ã¥teranrop returnerade fel: %s\n"
@@ -8736,58 +8743,58 @@ msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n"
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr "nyckeln finns redan\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "befintlig nyckel kommer att ersättas\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr "genererar ny nyckel\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, c-format
 msgid "writing new key\n"
 msgstr "skriver ny nyckel\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "misslyckades med att lagra nyckeln: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "svaret innehåller inte en RSA-modulus\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svaret innehåller inte den publika RSA-exponenten\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, fuzzy, c-format
 #| msgid "response does not contain the RSA public exponent\n"
 msgid "response does not contain the EC public key\n"
 msgstr "svaret innehåller inte den publika RSA-exponenten\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "var god vänta under tiden nyckeln genereras ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr "nyckelgenereringen misslyckades\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8795,64 +8802,64 @@ msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "nyckelgenereringen är färdig (%d sekunder)\n"
 msgstr[1] "nyckelgenereringen är färdig (%d sekunder)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "svaret innehåller inte publikt nyckeldata\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||Ange PIN-koden för nyckeln att skapa kvalificerade signaturer med."
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Ange administratörens PIN-kod"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|Ange upplåsningskoden (PUK-kod) för standardnycklarna."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Ange PIN-koden för standardnycklarna."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modulus saknas eller är inte %d bitar stor\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "Publik RSA-exponent saknas eller större än %d bitar\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "NullPIN har ännu inte ändrats\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN har ännu inte ändrats\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Ange en ny PIN-kod för standardnycklarna."
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|Ange en ny upplåsningskod (PUK-kod) för standardnycklarna."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 "|N|Ange en ny PIN-kod för nyckeln att skapa kvalificerade signaturer med."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8860,7 +8867,7 @@ msgstr ""
 "|NP|Ange en ny upplåsningskod (PUK-kod) för nyckeln att skapa kvalificerade "
 "signaturer med."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8868,27 +8875,27 @@ msgstr ""
 "|P|Ange upplåsningskoden (PUK-koden) för nyckeln att skapa kvalificerade "
 "signaturer med."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fel vid hämtning av ny PIN-kod: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "misslyckades med att lagra fingeravtrycket: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "misslyckades med att lagra datum för skapandet: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "fel vid hämtning av CHV-status från kort\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "läsning av publik nyckel misslyckades: %s\n"
@@ -8896,46 +8903,46 @@ msgstr "läsning av publik nyckel misslyckades: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "använder standard-PIN som %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "misslyckades med att använda standard-PIN som %s: %s - inaktiverar "
 "ytterligare standardanvändning\n"
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||Ange PIN-koden"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "validering av CHV%d misslyckades: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kortet är låst permanent!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, fuzzy, c-format
 #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@ -8946,20 +8953,20 @@ msgstr[0] ""
 msgstr[1] ""
 "%d försök för Admin PIN-koden återstår innan kortet låses permanent\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 msgid "||Please enter the PIN"
 msgstr "||Ange PIN-koden"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Ange nollställningskoden för kortet"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Nollställningskoden är för kort; minimumlängd är %d\n"
@@ -8967,77 +8974,77 @@ msgstr "Nollställningskoden är för kort; minimumlängd är %d\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr "|RN|Ny nollställningskod"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN-kod"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN-kod"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 #, fuzzy
 #| msgid "|A|Please enter the Admin PIN"
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "|A|Ange administratörens PIN-kod"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Ange PIN-koden"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr "fel vid läsning av programdata\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "fel vid läsning av fingeravtryckets DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "tidsstämpel för skapandet saknas\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA-primtal %s saknas eller inte %d bitar stor\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported curve\n"
 msgstr "algoritmen stöds inte: %s"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "avtrycket på kortet stämmer inte med den begärda\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer skapade hittills: %lu\n"
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
@@ -9045,7 +9052,7 @@ msgstr ""
 "validering av Admin PIN-kod är för närvarande förbjudet genom detta "
 "kommando\n"
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
@@ -9067,7 +9074,7 @@ msgstr "|N|Initial PIN-kod"
 msgid "run in multi server mode (foreground)"
 msgstr "kör i multiserverläge (förgrund)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
 
@@ -9113,13 +9120,13 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "neka användning av administratörskommandon för kort"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 #, fuzzy
 #| msgid ""
 #| "Syntax: scdaemon [options] [command [args]]\n"
@@ -9131,24 +9138,24 @@ msgstr ""
 "Syntax: scdaemon [flaggor] [kommando [argument]]\n"
 "Smartkortsdemon för GnuPG\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, fuzzy, c-format
 #| msgid ""
 #| "please use the option `--daemon' to run the program in the background\n"
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "använd flaggan \"--daemon\" för att köra programmet i bakgrunden\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "hanterare för fd %d startad\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "hanterare för fd %d avslutad\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -9378,7 +9385,7 @@ msgstr "rotcertifikatet har inte markerats som betrott"
 msgid "checking the trust list failed: %s\n"
 msgstr "kontroll mot tillitslistan misslyckades: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "certifikatkedjan är för lång\n"
@@ -9433,7 +9440,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "en %u-bitars hash är inte giltig för en %u-bitars %s-nyckel\n"
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
@@ -9479,46 +9486,46 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "skapad %s, går ut %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "ingen nyckelanvändning angiven - antar alla användningsområden\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for certification\n"
 msgid "certificate should not have been used for certification\n"
 msgstr "certifikatet skulle inte använts för certifiering\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for OCSP response signing\n"
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "certifikatet skulle inte använts för signering av OCSP-svar\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for encryption\n"
 msgid "certificate should not have been used for encryption\n"
 msgstr "certifikatet skulle inte använts för kryptering\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for signing\n"
 msgid "certificate should not have been used for signing\n"
 msgstr "certifikatet skulle inte använts för signering\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "certifikatet är inte användbart för kryptering\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "certifikatet är inte användbart för signering\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 #| msgid "Included certificates"
 msgid "looking for another certificate\n"
@@ -9728,6 +9735,11 @@ msgstr "Skapa ett spärrcertifikat för denna nyckel? (j/N) "
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:433
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "fel när temporärfil skapades: %s\n"
+
 #: sm/certreqgen-ui.c:439
 #, fuzzy
 #| msgid "self-signed certificate has a BAD signature"
@@ -9807,126 +9819,126 @@ msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
 msgid "no valid recipients given\n"
 msgstr "inga giltiga mottagare angavs\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "list external keys"
 msgstr "lista externa nycklar"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "list certificate chain"
 msgstr "lista certifikatkedja"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 msgid "import certificates"
 msgstr "importera certifikat"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "export certificates"
 msgstr "exportera certifikat"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr "registrera ett smartkort"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr "skicka ett kommando till dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr "starta gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "använd inte terminalen alls"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr "|N|antal certifikat att inkludera"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr "|FIL|hämta policyinformation från FIL"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr "anta att inmatning är i PEM-format"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr "anta att inmatning är i base-64-format"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr "anta att inmatning är i binärformat"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 msgid "create base-64 encoded output"
 msgstr "skapa base-64-kodat utdata"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|ANVÄNDAR-ID|använd ANVÄNDAR-ID som förvald hemlig nyckel"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FIL|lägg till nyckelring till listan över nyckelringar"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr "hämta saknade utfärdarcertifikat"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAMN|använd kodningen NAMN för PKCS#12-lösenfraser"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr "kontrollera aldrig mot spärrlista"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr "kontrollera inte spärrlistor för rotcertifikat"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr "kontrollera giltigheten med OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr "kontrollera inte certifikatpolicier"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|använd chifferalgoritmen NAMN"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|använd algoritmen NAMN för kontrollsummor"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "satsläge: fråga aldrig"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "anta ja på de flesta frågorna"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "anta nej på de flesta frågorna"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FIL|skriv en granskningslogg till FIL"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgsm [options] [files]\n"
@@ -9941,31 +9953,31 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, fuzzy, c-format
 #| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "OBSERVERA: kommer inte att kunna kryptera till \"%s\": %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, fuzzy, c-format
 #| msgid "unknown validation model `%s'\n"
 msgid "unknown validation model '%s'\n"
 msgstr "okänd valideringsmodell \"%s\"\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, fuzzy, c-format
 #| msgid "importing common certificates `%s'\n"
 msgid "importing common certificates '%s'\n"
 msgstr "importerar vanliga certifikat \"%s\"\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, fuzzy, c-format
 #| msgid "can't sign using `%s': %s\n"
 msgid "can't sign using '%s': %s\n"
 msgstr "kan inte signera med \"%s\": %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ogiltigt kommando (det finns inget implicit kommando)\n"
@@ -9995,7 +10007,7 @@ msgstr "fel vid hämtning av lagrade flaggor: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "fel vid import av certifikat: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "fel vid läsning av indata: %s\n"
@@ -10037,7 +10049,7 @@ msgstr "problem vid ytterligare sökning efter certifikat: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "fel vid lagring av flaggor: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Fel - "
 
@@ -10455,12 +10467,6 @@ msgstr "misslyckades med att skapa temporärfilen \"%s\": %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "fel vid stängning av %s: %s\n"
 
-#: dirmngr/crlcache.c:948
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "fel vid läsning av \"%s\": %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
@@ -11217,101 +11223,101 @@ msgstr "ogiltig debug-level \"%s\" angiven\n"
 msgid "usage: %s [options] "
 msgstr "användning: gpgsm [flaggor] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, 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:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' failed: %s\n"
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "konvertering från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, fuzzy, c-format
 #| msgid "line too long - skipped\n"
 msgid "%s:%u: line too long - skipped\n"
 msgstr "raden är för lång - hoppades över\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "ogiltigt fingeravtryck"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 #| msgid "read error in `%s': %s\n"
 msgid "%s:%u: read error: %s\n"
 msgstr "läsfel i \"%s\":  %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "inte tvingad"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 #| msgid "error running `%s': exit status %d\n"
 msgid "error accessing '%s': http status %u\n"
 msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many redirections\n"
 msgstr "för många chifferinställningar\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11723,63 +11729,63 @@ msgstr "certifikatet är korrekt\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "certifikatet skulle inte använts för signering\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "tyst"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr "skriv ut data hexkodat"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr "avkoda mottagna datarader"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "connect to the dirmngr"
 msgstr "skicka ett kommando till dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "skicka ett kommando till dirmngr"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAMN|anslut till Assuan-uttaget NAMN"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 #, fuzzy
 #| msgid "|NAME|connect to Assuan socket NAME"
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|NAMN|anslut till Assuan-uttaget NAMN"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr "kör Assuan-servern som angivits på kommandoraden"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr "använd inte utökat anslutningsläge"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FIL|kör kommandon från FIL vid uppstart"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr "kör /subst vid uppstart"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 #, fuzzy
 #| msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Användning: gpg-connect-agent [flaggor] (-h för hjälp)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-connect-agent [options]\n"
@@ -11791,50 +11797,50 @@ msgstr ""
 "Syntax: gpg-connect-agent [flaggor]\n"
 "Anslut till en körande agent och skicka kommandon\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "flaggan \"%s\" kräver ett program och valfria argument\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "flaggan \"%s\" ignoreras på grund av \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "mottagande rad misslyckades: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "raden är för lång - hoppades över\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "rad nerkortad på grund av inbäddat Nul-tecken\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, fuzzy, c-format
 #| msgid "unknown command `%s'\n"
 msgid "unknown command '%s'\n"
 msgstr "okänt kommando \"%s\"\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "sändande rad misslyckades: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr "ingen gpg-agent kör i den här sessionen\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "fel vid sändning av standardflaggor: %s\n"
@@ -11902,13 +11908,13 @@ msgstr "Extern validering av komponenten %s misslyckades"
 msgid "Note that group specifications are ignored\n"
 msgstr "Observera att gruppspecifikationer ignoreras\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing '%s'\n"
 msgstr "fel vid stängning av %s: %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
@@ -12118,6 +12124,14 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "fel vid skrivning till temporärfil: %s\n"
+
+#, fuzzy
+#~| msgid "run in server mode"
+#~ msgid "run in supervised mode"
+#~ msgstr "kör i serverläge"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Namnet får inte börja med en siffra\n"
 
@@ -12471,9 +12485,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "kunde inte öppna %s för skrivning: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "fel vid skrivning till %s: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "fel vid stängning av %s: %s\n"
 
diff --git a/po/tr.gmo b/po/tr.gmo
index 09969a8..d2cb6c8 100644
--- a/po/tr.gmo
+++ b/po/tr.gmo
diff --git a/po/tr.po b/po/tr.po
index ba29959..2a957cf 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.10rc1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2015-02-11 19:18+0100\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>\n"
 "Language-Team: Turkish\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "PIN giriÅŸ kilidi edinilemedi: %s\n"
@@ -29,53 +29,53 @@ msgstr "PIN giriÅŸ kilidi edinilemedi: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr ""
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr ""
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr ""
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr ""
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr ""
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, fuzzy
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "Enter new passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "Yeni anahtar parolasını giriniz"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -86,21 +86,21 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -108,7 +108,7 @@ msgstr "Anahtar Parolası çok uzun"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Kalite:"
 
@@ -118,11 +118,11 @@ msgstr "Kalite:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -130,7 +130,7 @@ msgstr ""
 "Lütfen PIN'inizi giriniz, böylelikle bu oturumda bu gizli anahtar kilitsiz "
 "olabilecek"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -138,76 +138,76 @@ msgstr ""
 "Lütfen anahtar parolanızı giriniz, böylelikle bu oturumda bu gizli anahtar "
 "kilitsiz olabilecek"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Anahtar Parolası:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "aynı değiller - tekrar deneyin"
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (%d/%d dene)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr ""
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 msgid "PIN too long"
 msgstr "PIN çok uzun"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 msgid "Passphrase too long"
 msgstr "Anahtar Parolası çok uzun"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 msgid "Invalid characters in PIN"
 msgstr "PIN içinde geçersiz karakterler var"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr "PIN çok kısa"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad PIN"
 msgstr "PIN hatalı"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad Passphrase"
 msgstr "Anahtar Parolası hatalı"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Lütfen bu anahtar parolasını tekrar girin"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, fuzzy, c-format
 #| msgid ""
 #| "Please enter the passphrase to protect the imported object within the "
@@ -219,7 +219,7 @@ msgstr ""
 "Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
 "giriniz."
 
-#: agent/command.c:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -231,9 +231,9 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "%d bitlikten daha büyük SSH anahtarları desteklenmiyor\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, fuzzy, c-format
 #| msgid "can't create `%s': %s\n"
 msgid "can't create '%s': %s\n"
@@ -241,15 +241,15 @@ msgstr "\"%s\" oluşturulamıyor: %s\n"
 
 #: agent/command-ssh.c:886 common/helpfile.c:57 g10/card-util.c:948
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, fuzzy, c-format
 #| msgid "can't open `%s': %s\n"
 msgid "can't open '%s': %s\n"
@@ -260,33 +260,33 @@ 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:2513
+#: agent/command-ssh.c:2467
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting list of cards: %s\n"
 msgstr "saklanmış bayraklar alınırken hata: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr ""
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr ""
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Lütfen SSH anahtarı %0A  %c için anahtar parolasını giriniz"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, fuzzy, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -295,91 +295,83 @@ msgstr ""
 "gpg-agent'in anahtar deposuna korumak için alınan gizli anahtar %%0A  %s%%0A "
 "için lütfen anahtar parolası giriniz"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "sokette akım oluşturulamadı: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr ""
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "Yönetici PIN'i"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr ""
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Sıfırlama Kodu"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 #, fuzzy
 #| msgid "do not use a reader's keypad"
 msgid "Use the reader's pinpad for input."
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Bu Sıfırlama Kodu tekrarlansın"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 #, fuzzy
 msgid "Repeat this PUK"
 msgstr "Bu PIN tekrarlansın "
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Bu PIN tekrarlansın "
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Sıfırlama Kodu doğru tekrarlanmadı; tekrar deneyin"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 #, fuzzy
 msgid "PUK not correctly repeated; try again"
 msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Kartın kilidini açmak için lütfen PIN%s%s%s giriniz"
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "geçici dosya oluşturulurken hata: %s\n"
-
-#: agent/genkey.c:150
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "geçeci dosyaya yazma hatası: %s\n"
+#: agent/genkey.c:154
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "%s yazılırken hata: %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 msgid "Enter new passphrase"
 msgstr "Yeni anahtar parolasını giriniz"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "Bir anahtar parolası girmediniz!%0ABoş parolaya izin verilmez."
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -388,11 +380,11 @@ msgstr ""
 "Bir anahtar parolası girmediniz - bu aslında kötü bir fikir!%0A Lütfen "
 "anahtarınıza herhangi bir koruma istemediğinizi onaylayınız."
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr "Evet, korumak gereksiz"
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, fuzzy, c-format
 #| msgid "Name must be at least 5 characters long\n"
 msgid "A passphrase should be at least %u character long."
@@ -400,7 +392,7 @@ msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "Ad ve soyadınız en az 5 harfli olmalı\n"
 msgstr[1] "Ad ve soyadınız en az 5 harfli olmalı\n"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -418,7 +410,7 @@ msgstr[1] ""
 "Uyarı: Girdiğiniz anahtar parolası güvenli değil.%%0AParola en az %u rakam "
 "veya%%0Aözel karakter içermeli."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, fuzzy, c-format
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase may not "
@@ -428,7 +420,7 @@ msgstr ""
 "Uyarı: Girdiğiniz anahtar parolası güvenli değil.%%0AParola bilinen bir "
 "terim olmamalı ve%%0Abelli bir kalıpla eşleşmemeli."
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 #, fuzzy
 #| msgid ""
 #| "Warning: You have entered an insecure passphrase.%%0AA passphrase should "
@@ -441,247 +433,241 @@ msgstr ""
 "Uyarı: Girdiğiniz anahtar parolası güvenli değil.%%0AParola en az %u "
 "karakterlik olmalı."
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 msgid "Take this one anyway"
 msgstr "Ne olursa olsun bunu al"
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, fuzzy, c-format
 #| msgid "Please enter the passphrase to%0Ato protect your new key"
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Yeni anahtarınızı korumak için Lütfen%0AAnahtar Parolanızı giriniz"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 msgid "Please enter the new passphrase"
 msgstr "Lütfen yeni anahtar parolasını girin"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Hata ayıklamaya elverişli seçenekler"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr "artalan süreci olarak çalışır"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr "sunucu olarak (önalanda) çalışır"
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-#, fuzzy
-#| msgid "run in server mode"
-msgid "run in supervised mode"
-msgstr "sunucu kipinde çalışır"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr "konsoldan kopulmaz"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr "sh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr "csh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 msgid "|FILE|read options from FILE"
 msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr "Tanı çıktısını denetleyen seçenekler"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "ayrıntılı"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "biraz daha sessiz olur"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|DOSYA|sunucu kipi günlükleri DOSYAya yazar"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr "Yapılandırmayı denetleyen seçenekler"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "Akıllı kart süreci kullanılmaz"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|connect to Assuan socket NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "TTY değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "X birimi değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 #, fuzzy
 #| msgid "enable ssh-agent emulation"
 msgid "enable ssh support"
 msgstr "ssh-agent öykünümü etkinleşir"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr ""
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 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:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|SSH anahtarları N saniyede zamanaşımına uğrar"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|azami PIN önbelleği ömrü N saniyeye ayarlanır"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|azami SSH anahtarı ömrü N saniyeye ayarlanır"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr "imzalarken PIN arabelleği kullanılmaz"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 #, fuzzy
 #| msgid "do not allow the reuse of old passphrases"
 msgid "disallow the use of an external password cache"
 msgstr "eski anahtar parolalarının yeniden kullanılmasına izin vermez"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 #, fuzzy
 #| msgid "allow clients to mark keys as \"trusted\""
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verilir"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 msgid "allow presetting passphrase"
 msgstr "anahtar parolasının önceden atanmasına izin verilir"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr "Bir anahtar parolası kuralını zorlayan seçenekler"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr "anahtar parolası kuralının atlanmasına izin verilmez"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|yeni anahtar parolası için gereken en küçük uzunluk N'ye ayarlanır"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr ""
 "|N|yeni bir anahtar parolası için en azından harf olmayan N karakter gerekir"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|DOSYA|yeni anahtar parolası DOSYAdaki kalıba göre sınanır"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|anahtar parolası N gün sonra zaman aşımına uğrar"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 msgid "do not allow the reuse of old passphrases"
 msgstr "eski anahtar parolalarının yeniden kullanılmasına izin vermez"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Güvenliği denetleyen seçenekler"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "klavye ve fare gaspedilmez"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 #, fuzzy
 #| msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|azami PIN önbelleği ömrü N saniyeye ayarlanır"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 #, fuzzy
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Yazılım hatalarını lütfen <"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-agent [options] [command [args]]\n"
@@ -693,143 +679,148 @@ msgstr ""
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, fuzzy, c-format
 #| msgid "invalid debug-level `%s' given\n"
 msgid "invalid debug-level '%s' given\n"
 msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özet algoritması geçersiz\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, fuzzy, c-format
 #| msgid "reading options from `%s'\n"
 msgid "reading options from '%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 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 "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: agent/gpg-agent.c:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, 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:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "soket oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, fuzzy, c-format
 #| msgid "socket name `%s' is too long\n"
 msgid "socket name '%s' is too long\n"
 msgstr "soketin ismi `%s' çok uzun\n"
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, 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:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "soket için tuz alınırken hata\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, fuzzy, c-format
 #| msgid "error binding socket to `%s': %s\n"
 msgid "error binding socket to '%s': %s\n"
 msgstr "soket `%s'e bağlanırken hata: %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, fuzzy, c-format
 #| msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgid "can't set permissions of '%s': %s\n"
 msgstr "UYARI: %s üzerinde izinler güvensiz: \"%s\"\n"
 
-#: agent/gpg-agent.c:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, fuzzy, c-format
 #| msgid "listening on socket `%s'\n"
 msgid "listening on socket '%s'\n"
 msgstr "`%s' soketi dinlemede\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, fuzzy, c-format
 #| msgid "can't create directory `%s': %s\n"
 msgid "can't create directory '%s': %s\n"
 msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, fuzzy, c-format
 #| msgid "directory `%s' created\n"
 msgid "directory '%s' created\n"
 msgstr "dizin `%s' oluÅŸturuldu\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, fuzzy, c-format
 #| msgid "stat() failed for `%s': %s\n"
 msgid "stat() failed for '%s': %s\n"
 msgstr "%s için stat() başarısız oldu: %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, fuzzy, c-format
 #| msgid "can't use `%s' as home directory\n"
 msgid "can't use '%s' as home directory\n"
 msgstr "`%s' ev dizini olarak kullanılamıyor\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "tutamak 0x%lx, fd %d için başlatıldı\n"
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "tutamak 0x%lx, fd %d için sonlandırıldı\n"
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh tutamağı 0x%lx, fd %d için başlatıldı\n"
 
-#: agent/gpg-agent.c:2832
+#: agent/gpg-agent.c:2842
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh tutamağı 0x%lx, fd %d için sonlandırıldı\n"
 
-#: agent/gpg-agent.c:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, fuzzy, c-format
 #| msgid "pth_select failed: %s - waiting 1s\n"
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "pth_select başarısız: %s - 1s bekliyor\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s durdu\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
@@ -855,7 +846,7 @@ msgstr ""
 "Sözdizimi: gpg-preset-passphrase [seçenekler] ANHMAŞASI\n"
 "Parola arabelleği bakımcısı\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -865,7 +856,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -922,49 +913,49 @@ msgstr "iptal edildi\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "anahtar parolası sorulurken hata: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, fuzzy, c-format
 #| msgid "error opening `%s': %s\n"
 msgid "error opening '%s': %s\n"
 msgstr "'%s' açılırken hata: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, fuzzy, c-format
 #| msgid "file `%s', line %d: %s\n"
 msgid "file '%s', line %d: %s\n"
 msgstr "`%s' dosyası, %d. satır: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, fuzzy, c-format
 #| msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "`%2$s' dosyasının %3$d. satırındaki \"%1$s\" deyimi yoksayıldı\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, fuzzy, c-format
 #| msgid "system trustlist `%s' not available\n"
 msgid "system trustlist '%s' not available\n"
 msgstr "sistem güvence listesi `%s' kullanım dışı\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, fuzzy, c-format
 #| msgid "bad fingerprint in `%s', line %d\n"
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "`%s', %d. satırda parmakizi hatalı\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, fuzzy, c-format
 #| msgid "invalid keyflag in `%s', line %d\n"
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "`%s', %d. satırda anahtar bayrağı geçersiz\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, fuzzy, c-format
 #| msgid "error reading `%s', line %d: %s\n"
 msgid "error reading '%s', line %d: %s\n"
 msgstr "`%s' okunurken %d. satırda hata: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
@@ -977,7 +968,7 @@ msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -986,11 +977,11 @@ msgstr ""
 "Kullanıcı sertifikalarının%%0A  \"%s\"%%0Aile doğru olarak onaylanacağından "
 "son derece emin misiniz?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 msgid "Yes"
 msgstr "Evet"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr "Hayır"
@@ -1003,7 +994,7 @@ msgstr "Hayır"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -1015,21 +1006,27 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr "DoÄŸru"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr ""
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, fuzzy, c-format
+#| msgid "error reading `%s': %s\n"
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "\"%s\" okunurken hata: %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Bilginize: Bu anahtar parolası hiç değişmedi%0ALütfen şimdi değiştirin."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -1038,15 +1035,24 @@ msgstr ""
 "Bu anahtar parolası %.4s-%.2s-%.2s tarihinden beri hiç değişmedi%%0ALütfen "
 "ÅŸimdi deÄŸiÅŸtirin."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 msgid "Change passphrase"
 msgstr "Anahtar parolasını değiştir"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr "Sonra deÄŸiÅŸtireceÄŸim"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+msgid "Please insert the card with serial number"
+msgstr ""
+
+#: agent/findkey.c:1231
+#, c-format
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+
+#: agent/findkey.c:1741
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -1054,13 +1060,13 @@ msgid ""
 "%%0A?"
 msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 #, fuzzy
 #| msgid "enable key"
 msgid "Delete key"
 msgstr "anahtarı kullanıma sokar"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1083,7 +1089,7 @@ msgstr "%s anahtarı, güvensiz bir çittirim (%u bitlik) kullanıyor\n"
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%u bitlik çittirim %u bitlik %s anahtarı için geçersiz\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
@@ -1126,7 +1132,7 @@ msgid "error creating a stream for a pipe: %s\n"
 msgstr "boru oluÅŸturulurken hata: %s\n"
 
 #: common/exechelp-posix.c:514 common/exechelp-posix.c:589
-#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "süreç çatallanırken hata: %s\n"
@@ -1192,13 +1198,13 @@ msgstr "UYARI: %s üzerinde sahiplik güvensiz: \"%s\"\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "UYARI: %s üzerinde izinler güvensiz: \"%s\"\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:880
 #, fuzzy, c-format
 #| msgid "waiting for process %d to terminate failed: %s\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "renaming '%s' to '%s' failed: %s\n"
@@ -1431,7 +1437,7 @@ msgid "algorithm: %s"
 msgstr "algoritma: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "desteklenmeyen algoritma: %s"
@@ -1590,7 +1596,7 @@ msgstr "`%s' > `%s' dönüşümü elverişli değil\n"
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open başarısız: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' failed: %s\n"
 msgid "conversion from '%s' to '%s' failed: %s\n"
@@ -1633,7 +1639,7 @@ msgstr "kilit `%s' yapılmadı: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "%s kilidi için bekleniyor...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s çok eski (gereken %s, sizinki %s)\n"
@@ -1812,7 +1818,7 @@ msgstr "%s okunurken 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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
@@ -1858,7 +1864,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1886,7 +1892,7 @@ msgstr "bu önceden betik kipinde yapılamaz\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Bu komut sadece 2. sürüm kartlar için kullanılabilir\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "Sıfırlama kodu ya yok ya da kullanım dışı\n"
@@ -1951,15 +1957,15 @@ msgstr "genel anahtarın alınacağı URL: "
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, fuzzy, c-format
 #| msgid "error reading `%s': %s\n"
 msgid "error reading '%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, fuzzy, c-format
 msgid "error writing '%s': %s\n"
@@ -2306,27 +2312,27 @@ msgstr "Yönetici komutlarına izin verilmez\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, fuzzy, c-format
 #| msgid "can't open `%s'\n"
 msgid "can't open '%s'\n"
 msgstr "`%s' açılamadı\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 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,8 +2395,8 @@ msgid "subkey"
 msgstr "GenAnah: "
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
@@ -2454,15 +2460,15 @@ msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, fuzzy, c-format
 #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2488,7 +2494,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2596,12 +2602,12 @@ msgstr "gizli anahtarların ihracına izin verilmez\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "anahtar %s: PGP 2.x tarzı bir anahtar - atlandı\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, fuzzy, c-format
 #| msgid "error creating `%s': %s\n"
@@ -2672,301 +2678,301 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
 msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 msgid "make a signature"
 msgstr "bir imza yapar"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "make a clear text signature"
 msgstr "açıkça okunabilen bir imza yapar"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "veriyi ÅŸifreler"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik ÅŸifre ile ÅŸifreler"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr ""
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 #, fuzzy
 #| msgid "sign a key"
 msgid "quickly sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 #, fuzzy
 #| msgid "sign a key locally"
 msgid "quickly sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "anahtar parolası değiştirir"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr "kart durumunu basar"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr "kart üzerindeki veriyi değiştirir"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr "bir kartın PIN'ini değiştirir"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid "print message digests"
 msgstr "ileti özetlerini gösterir"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "sunucu kipinde çalışır"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|İSİM|öntanımlı gizli anahtar olarak İSİM kullanılır"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|İSİM|İSİM kullanıcısı için de şifreleme yapar"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr "|BELİRTİM|eposta rumuzlarını ayarlar"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr "kesin OpenPGP davranışı etkin olur"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "üzerine yazmadan önce sorar"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Güvenliği denetleyen seçenekler"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Tanı çıktısını denetleyen seçenekler"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|DOSYA|çıktı DOSYAya yazılır"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 iptal eder)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
 msgstr "Etkileşimliliği ve zorlamayı denetleyen seçenekler"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 "|MEKANİZMALAR|anahtarları eposta adreslerine göre konumlamak için "
 "MEKANİZMALAR kullanılır"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "dirmngr'a tüm erişim iptal edilir"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "Yapılandırmayı denetleyen seçenekler"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|KULLANICI-KİMLİĞİ|KULLANICI-KİMLİĞİ için şifreleme yapar"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "|KULLANICI-KİMLİĞİ|imzalamak ya da şifre çözmek için KULLANICI-KİMLİĞİ "
 "kullanılır"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2974,7 +2980,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -3004,13 +3010,13 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg [options] [files]\n"
@@ -3025,7 +3031,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -3033,82 +3039,82 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Åžifre: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, fuzzy, c-format
 #| msgid "usage: gpgsm [options] "
 msgid "usage: %s [options] %s\n"
 msgstr "kullanımı: gpgsm [seçenekler] "
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, fuzzy, c-format
 #| msgid "no = sign found in group definition `%s'\n"
 msgid "no = sign found in group definition '%s'\n"
 msgstr "grup tanımı '%s' içinde = işareti yok\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -3116,19 +3122,19 @@ msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, fuzzy, c-format
 #| msgid ""
 #| "WARNING: unsafe enclosing directory permissions on configuration file `"
@@ -3137,501 +3143,501 @@ msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, fuzzy, c-format
 #| msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, fuzzy, c-format
 #| msgid "unknown configuration item `%s'\n"
 msgid "unknown configuration item '%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 #, fuzzy
 #| msgid "show user ID validity during key listings"
 msgid "show key usage information during key listings"
 msgstr "anahtar listelemesi sırasında kullanıcı kimliği geçerliliğini gösterir"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 msgid "show all notations during signature listings"
 msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr "anahtar listelemesi sırasında kullanıcı kimliği geçerliliğini gösterir"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
 "kullanıcı kimlikleri gösterilir"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 "anahtar listelerinde yürürlükten kaldırılmış ve zamanaşımına uğramış "
 "yardımcı anahtarlar gösterilir"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 msgid "show the keyring name in key listings"
 msgstr "anahtar zinciri ismini anahtar listelerinde gösterir"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 msgid "show expiration dates during signature listings"
 msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, fuzzy, c-format
 #| msgid "unknown option `%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, fuzzy, c-format
 #| msgid "NOTE: %s is not for normal use!\n"
 msgid "Note: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' geçerli bir imza zamanaşımı değil\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 #| msgid "line %d: not a valid email address\n"
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "%d. satır: geçerli bir eposta adresi değil\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, fuzzy, c-format
 #| msgid "invalid country code in `%s', line %d\n"
 msgid "invalid pinentry mode '%s'\n"
 msgstr "`%s', %d. satırındaki ülke kodu geçersiz\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "invalid request origin '%s'\n"
 msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid character set\n"
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 msgid "show all notations during signature verification"
 msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "imza doğrulaması sırasında tercih edilen anahtar sunucusu adresleri "
 "gösterilir"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 msgid "show user ID validity during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kimliği geçerliliğini gösterir"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "imza doğrulamasında yürürlükten kaldırılan ve zamanaşımına uğrayan kullanıcı "
 "kimlikleri gösterilir"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 msgid "show only the primary user ID in signature verification"
 msgstr "imza doğrulamasında sadece birincil kullanıcı kimlik gösterilir"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, fuzzy, c-format
 #| msgid "missing argument for option \"%.50s\"\n"
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "\"%.50s\" seçeneği için değiştirge eksik\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "seçilen özet algoritması geçersiz\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özet algoritması geçersiz\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, fuzzy, c-format
 #| msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BÄ°LGÄ°: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özet tercihleri geçersiz\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 #| msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, fuzzy, c-format
 #| msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' sıkıştırma algoritması kullanılamaz\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, fuzzy, c-format
 #| msgid "symmetric encryption of `%s' failed: %s\n"
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, 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:4417
+#: g10/gpg.c:4418
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "%s kipindeyken  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile --symmetric --sign --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "anahtar sunucusundan alım başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, fuzzy, c-format
 #| msgid "invalid hash algorithm `%s'\n"
 msgid "invalid hash algorithm '%s'\n"
 msgstr "`%s' çittirim algoritması geçersiz\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, fuzzy, c-format
 #| msgid "error storing certificate: %s\n"
 msgid "error parsing key specification '%s': %s\n"
 msgstr "serifika saklanırken hata: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
@@ -3644,7 +3650,7 @@ msgstr "|DOSYA|anahtarlar DOSYA anahtar zincirinden alınır"
 msgid "make timestamp conflicts only a warning"
 msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
@@ -4399,7 +4405,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H veya y/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
@@ -4580,8 +4586,8 @@ msgstr "Bu anahtarı çok dikkatle sınadım.\n"
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H veya y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
@@ -4798,7 +4804,7 @@ msgstr ""
 "  için 'nr', yerel imzalar için 'l' (lsign) veya buların karışımı   olarak "
 "(ltsign, tnrsign gibi).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
@@ -4850,7 +4856,7 @@ msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? (e/H ya da y/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "Bu öz-imza gerçekten taşınacak mı?  (e/H ya da y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
 
@@ -4939,178 +4945,178 @@ msgstr "DeÄŸiÅŸiklikler kaydedilecek mi? (e/H ya da y/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "revoking the user ID failed: %s\n"
 msgstr "güvence listesinin sınanması başarısız: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "setting the primary user ID failed: %s\n"
 msgstr "güvence listesinin sınanması başarısız: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "parmakizi geçersiz"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, fuzzy, c-format
 #| msgid "failed to get the fingerprint\n"
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "parmakizinin alınması başarısız oldu\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "değer hatalı\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 #| msgid "No such user ID.\n"
 msgid "No matching user IDs."
 msgstr "Böyle bir kullanıcı kimliği yok.\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 #, fuzzy
 #| msgid "Nothing to sign with key %s\n"
 msgid "Nothing to sign.\n"
 msgstr "%s anahtarı ile imzalanacak hiçbir şey yok\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "oluşturulan imzanın denetimi başarısız: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 #| msgid "`%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' geçerli bir imza zamanaşımı değil\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "parmakizi geçersiz"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Özet: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr "Anahtar sunucusu deÄŸiÅŸmez"
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr "Tercih edilen anahtar sunucusu: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 msgid "Notations: "
 msgstr "Simgelemler: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Bir PGP 2.x tarzı kullanıcı kimliğine uygun tercih yok.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, fuzzy, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr ""
 "Bu anahtar %2$s tarafından %3$s anahtarıyla %1$s üzerinde yürürlükten "
 "kaldırılmış\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 "Bu anahtar %s tarafından %s anahtarıyla yürürlükten kaldırılmış olabilir"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr "(duyarlı)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "oluÅŸturuldu: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr "kullanımı: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr "kart-no: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr "güvencesi: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr "geçerliliği: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmiÅŸti"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -5118,17 +5124,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:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -5138,18 +5144,18 @@ msgstr ""
 "       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
 "       kabul edilmesini saÄŸlayabilirsiniz.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr ""
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, fuzzy, c-format
 #| msgid "You can't change the expiration date of a v3 key\n"
 msgid "You may want to change its expiration date too.\n"
 msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -5158,35 +5164,35 @@ msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H veya y/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+msgid "Such a user ID already exists on this key!"
 msgstr ""
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doÄŸru imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H veya y/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, fuzzy, c-format
 #| msgid "Deleted %d signature.\n"
 msgid "Deleted %d signature.\n"
@@ -5194,20 +5200,20 @@ msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "%d imza silindi.\n"
 msgstr[1] "%d imza silindi.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "geçersiz"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "kullanıcı kimliği \"%s\" yoğun: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, fuzzy, c-format
 #| msgid "User ID \"%s\": %d signature removed\n"
 msgid "User ID \"%s\": %d signature removed\n"
@@ -5215,17 +5221,17 @@ 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:4467
+#: g10/keyedit.c:4523
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kullanıcı kimliği \"%s\": zaten küçük\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5235,50 +5241,50 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı "
 "ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 "Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
 "olarak atanamaz\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak "
 "kullanamazsınız\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "bu anahtar zaten onu üreten tarafından yürürlükten kaldırılmıştı\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar başka amaçla\n"
 "       kullanılamaz!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Bu anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5289,183 +5295,183 @@ msgstr ""
 "Bu anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "yardımcı imzalama anahtarı %s zaten çapraz sertifikalı\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "yardımcı anahtar %s imzalamıyor, dolayısıyla çapraz sertifikalı olması "
 "gerekmiyor\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, 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:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiÄŸiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Onu deÄŸiÅŸtirmek istediÄŸinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Onu silmek istediÄŸinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 msgid "Enter the notation: "
 msgstr "Simgelemi giriniz: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 msgid "Proceed? (y/N) "
 msgstr "Devam? (e/H ya da y/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%s çittirmeli kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, fuzzy, c-format
 #| msgid "No subkey with index %d\n"
 msgid "No subkey with key ID '%s'.\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s anahtarınızla %s%s%s de imzalandı\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H veya y/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H veya "
 "y/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Bu kullanıcı kimliklerini %s anahtarı üzerinde imzalamışsınız:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr " (yürülükten kaldırılmaz)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "%s tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 "Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H "
 "veya y/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, 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:6359
+#: g10/keyedit.c:6415
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Yardımcı anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5906,6 +5912,10 @@ msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 "Lütfen E-posta adresinizi Adı ve Soyadı veya Açıklama alanı içine koymayın\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr ""
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -6242,7 +6252,7 @@ msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
@@ -6250,49 +6260,49 @@ msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "%d anahtar %s adresinden tazeleniyor\n"
 msgstr[1] "%d anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "anahtar, anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "%s anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 #| msgid "no keyserver action!\n"
 msgid "no keyserver known\n"
 msgstr "bir anahtar sunucusu eylemi yok!\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "\"%s\" atlandı: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "%s anahtarı %s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, fuzzy, c-format
 #| msgid "requesting key %s from %s\n"
 msgid "requesting key from '%s'\n"
 msgstr "%s anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "UYARI: Betimleyici %s alınamıyor: %s\n"
@@ -6325,12 +6335,12 @@ msgstr "bilinmeyen algoritma %d ile ÅŸifrelenmiÅŸ\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "bilinmeyen özet algoritması ile üretilmiş anahtar parolası %d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr "genel anahtar: %s\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
@@ -6338,244 +6348,244 @@ msgstr ""
 "%u bitlik %s anahtarı ve %s kullanıcı kimliği ile şifrelendi, %s tarihinde "
 "oluÅŸturuldu\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s anahtarı ve %s kullanıcı kimliği ile şifrelenmiş\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "UYAR: çok sayıda salt metin görüldü\n"
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "genel anahtarla ÅŸifreli veri: doÄŸru DEK\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s şifreli veri varsayılıyor\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA şifre kullanışsız, iyimserlikle yerine %s kullanılmaya çalışılıyor\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "UYARI: ileti bütünlük korumalı değildi\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: ÅŸifreli ileti tahrip edilmiÅŸ!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, fuzzy, c-format
 #| msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "BİLGİ: gönderen \"yalnız-gözleriniz-için\" ricasında bulundu\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, c-format
 msgid "no signature found\n"
 msgstr "hiç imza yok\n"
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" deki imza KÖTÜ"
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\" deki imza zamanaşımına uğramış"
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "imza doÄŸrulama engellendi\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "bu belirsiz imza verisi elde edilemiyor\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Ä°mza %s de\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s kullanılarak anahtar %s ile yapılmış\n"
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s imzası, %s anahtarı ve %s kullanıcı kimliği ile yapılmış\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Anahtar burada:"
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "UYARI: Bu anahtar güven dereceli bir imza ile sertifikalanmamış!\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, fuzzy, c-format
 #| msgid "%s signature, digest algorithm %s\n"
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s imzası, %s özet algoritması\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "ikili"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 #, fuzzy
 #| msgid "algorithm: %s"
 msgid ", key algorithm "
 msgstr "algoritma: %s"
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ä°mza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
@@ -6650,11 +6660,6 @@ msgstr ""
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: \"%s\" seçeneği kullanımdan kaldırılmak üzere.\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "UYARI: %s seçeneği kullanımdan kaldırılmak üzere.\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7783,137 +7788,137 @@ msgstr "`%s' için okuma hatası: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "güvence veritabanı: eşzamanlama başarısız: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, fuzzy, c-format
 #| msgid "can't create lock for `%s'\n"
 msgid "can't create lock for '%s'\n"
 msgstr "`%s' için kilit oluşturulamıyor\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, fuzzy, c-format
 #| msgid "can't lock `%s'\n"
 msgid "can't lock '%s'\n"
 msgstr "`%s' kiltlenemedi\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "güvence veritabanı %lu kaydı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "güvence veritabanı %lu kaydı: yazma başarısız (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "güvence veritabanı işlemi çok uzun\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: dizin yok!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
 msgid "can't access '%s': %s\n"
 msgstr "'%s' eriÅŸilemiyor: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: sürüm kaydı oluşturmada başarısız: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: geçersiz güvence veritabanı oluşturuldu\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: güvence veritabanı oluşturuldu\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, fuzzy, c-format
 #| msgid "NOTE: trustdb not writable\n"
 msgid "Note: trustdb not writable\n"
 msgstr "BİLGİ: güvence veritabanına yazılamıyor\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: güvence veritabanı geçersiz\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: çittirim tablosu oluşturulamadı: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: sürüm kaydının güncellenmesinde hata: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: sürüm kaydının okunmasında hata: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: sürüm kaydının yazılmasında hata: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "güvence veritabanı: erişim başarısız: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "güvence veritabanı: okuma başarısız (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: bir güvence veritabanı dosyası değil\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: %lu kayıt numarası ile sürüm kaydı\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: dosya sürümü %d geçersiz\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: serbest kaydı okuma hatası: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: dizin kaydını yazma hatası: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: kayıt sıfırlama başarısız: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: kayıt ekleme başarısız: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, fuzzy, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "%s: güvence veritabanı oluşturuldu\n"
@@ -8558,16 +8563,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8606,10 +8611,10 @@ msgstr "||Lütfen PIN'i giriniz"
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN eylemcisi hata döndürdü: %s\n"
@@ -8631,58 +8636,58 @@ msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr "anahtar zaten mevcut\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "mevcut anahtar konulacak\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, fuzzy, c-format
 msgid "writing new key\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "anahtarın saklanması başarısız: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "yanıt RSA modülü içermiyor\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, fuzzy, c-format
 #| msgid "response does not contain the RSA public exponent\n"
 msgid "response does not contain the EC public key\n"
 msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr "anahtar üretimi başarısızlığa uğradı\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
@@ -8690,100 +8695,100 @@ msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "anahtar üretimi tamamlandı (%d saniye)\n"
 msgstr[1] "anahtar üretimi tamamlandı (%d saniye)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "yanıt genel anahtar verisi içermiyor\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "|A|Lütfen Yönetici PIN'ini okuyucu tuştakımından giriniz"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modülü ya eksik ya da %d bitlik değil\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA genel üstel sayısı ya eksik ya da %d bitten büyük\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "BoşPIN henüz değişmedi\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "BoşPIN henüz değişmedi\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "||Lütfen PIN'inizi okuyucunun tuştakımından giriniz"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "yeni PIN alınırken hata: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "parmakizinin saklanması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "karttan CHV durumu alınırken hata\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "genel anahtar okuması başarısız: %s\n"
@@ -8791,46 +8796,46 @@ msgstr "genel anahtar okuması başarısız: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "%s olarak öntanımlı PIN kullanılıyor\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "%s olarak öntanımlı PIN kullanılamadı: %s - öntanımlı kullanımı iptal "
 "ediliyor\n"
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "kart kalıcı olarak kilitli!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, fuzzy, c-format
 #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@ -8841,20 +8846,20 @@ msgstr[0] ""
 msgstr[1] ""
 "kart kalıcı olarak kilitlenmeden önce %d Yönetici PIN kalmasına çalışılıyor\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 msgid "||Please enter the PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Sıfırlama Kodu çok kısa; asgari uzunluk: %d\n"
@@ -8862,82 +8867,82 @@ msgstr "Sıfırlama Kodu çok kısa; asgari uzunluk: %d\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr "|YSK|Yeni Sıfırlama Kodu"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr "|YYP|Yeni Yönetici PIN'i"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr "|N|Yeni PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 #, fuzzy
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr "uygulama verisi okunurken hata\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "parmakizi DO okunurken hata\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "oluşturum zaman damgası kayıp\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA asal sayısı %s ya eksik la da %d bitlik değil\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, fuzzy, c-format
 #| msgid "unsupported algorithm: %s"
 msgid "unsupported curve\n"
 msgstr "desteklenmeyen algoritma: %s"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP kartının yapısı geçersiz (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "karttaki parmak izi istenenle eÅŸleÅŸmiyor\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kart %s özet algoritmasını desteklemiyor\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "ÅŸu ana kadar oluÅŸturulan imzalar: %lu\n"
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "Yönetici PIN'inin doğrulanması bu komut yüzünden şimdilik yasaktır\n"
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@ -8959,7 +8964,7 @@ msgstr "|N|Ä°lk Yeni PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "çoklu sunucu kipinde çalışır (önalanda)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
 
@@ -9006,13 +9011,13 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "yönetici kartı komutları kullanımına izin verir"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 #, fuzzy
 #| msgid "Usage: gpgconf [options] (-h for help)"
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 #, fuzzy
 #| msgid ""
 #| "Syntax: scdaemon [options] [command [args]]\n"
@@ -9024,7 +9029,7 @@ msgstr ""
 "Sözdizimi: scdaemon [seçenekler] [komut [arg ...]]\n"
 "GnuPG için akıllı kart artalan süreci\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, fuzzy, c-format
 #| msgid ""
 #| "please use the option `--daemon' to run the program in the background\n"
@@ -9033,17 +9038,17 @@ msgstr ""
 "Programı artalanda çalışır bırakmak için lütfen `--daemon' seçeneğini "
 "kullanın\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d için eylemci başlatıldı\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d için eylemci sonlandı\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -9273,7 +9278,7 @@ msgstr "kök sertifika güvenilir olarak imli değil"
 msgid "checking the trust list failed: %s\n"
 msgstr "güvence listesinin sınanması başarısız: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "sertifika zinciri çok uzun\n"
@@ -9328,7 +9333,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u bitlik çittirim %u bitlik %s anahtarı için geçersiz\n"
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
@@ -9374,46 +9379,46 @@ msgstr ""
 "S/N: %s, Kimlik: 0x%08lX,\n"
 "oluşturuluşu: %s, süre bitimi: %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "hiç anahtar kullanımı belirtilmemiş - tüm kullanımlar var sayılıyor\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for certification\n"
 msgid "certificate should not have been used for certification\n"
 msgstr "sertifika onaylama için kullanılmamalıydı\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for OCSP response signing\n"
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "sertifika, OCSP yanıtının imzalanması için kullanılmamalıydı\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for encryption\n"
 msgid "certificate should not have been used for encryption\n"
 msgstr "sertifika şifreleme için kullanılmamalıydı\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, fuzzy, c-format
 #| msgid "certificate should have not been used for signing\n"
 msgid "certificate should not have been used for signing\n"
 msgstr "sertifika imzalama için kullanılmamalıydı\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "sertifika şifreleme için elverişli değil\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "sertifika imzalama için elverişli değil\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 #| msgid "Included certificates"
 msgid "looking for another certificate\n"
@@ -9621,6 +9626,11 @@ msgstr ""
 msgid "These parameters are used:\n"
 msgstr ""
 
+#: sm/certreqgen-ui.c:433
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "geçici dosya oluşturulurken hata: %s\n"
+
 #: sm/certreqgen-ui.c:439
 #, fuzzy
 #| msgid "self-signed certificate has a BAD signature"
@@ -9699,127 +9709,127 @@ msgstr "\"%s\" sertifikası silinemedi: %s\n"
 msgid "no valid recipients given\n"
 msgstr "geçerli alıcılar verilmedi\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "list external keys"
 msgstr "harici anahtarları listeler"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "list certificate chain"
 msgstr "sertifika zincirini listeler"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 msgid "import certificates"
 msgstr "sertifikaları ithal eder"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "export certificates"
 msgstr "sertifikaları ihraç eder"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr "bir akıllı kartı kayda alır"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr "dirmngr'a bir komut aktarır"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr "gpg-protect-tool'u çalıştırır"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "terminali hiç kullanma"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr "|N|içerilecek sertifika sayısı"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr "girdinin PEM biçiminde olduğu kabul edilir"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr "girdinin base-64 biçiminde olduğu kabul edilir"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr "girdinin ikilik biçimde olduğu kabul edilir"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 msgid "create base-64 encoded output"
 msgstr "base-64 kodlu çıktı oluşturur"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr ""
 "|KULLANICI-KİMLİĞİ|öntanımlı gizli anahtar olarak KULLANICI-KİMLİĞİ "
 "kullanılır"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|DOSYA|anahtar zincirini anahtar zincirleri listesine ekler"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr "kayıp sertifikacı sertifikalarını alır"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|İSİM|PKCS#12 anahtar parolaları için kodlama olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr "asla bir CRL sormaz"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr "kök sertifikalar için CRLler sınanmaz"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr "doğruluğu OCSP kullarak sınar"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr "sertifika poliçeleri sınanmaz"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|İSİM|özet algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "soruların çoğunda cevap evet farzedilir"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "soruların çoğunda cevap hayır farzedilir"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 msgid "|FILE|write an audit log to FILE"
 msgstr "|DOSYA|bir denetim günlüğünü DOSYAya yazar"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 #, fuzzy
 #| msgid "Usage: gpg [options] [files] (-h for help)"
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpgsm [options] [files]\n"
@@ -9834,31 +9844,31 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme S/MIME protokolü kullanarak yapılır\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, fuzzy, c-format
 #| msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "BÄ°LGÄ°:`%s'e ÅŸifrelenemez: %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, fuzzy, c-format
 #| msgid "unknown validation model `%s'\n"
 msgid "unknown validation model '%s'\n"
 msgstr "`%s' geçerlilik modeli bilinmiyor\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, fuzzy, c-format
 #| msgid "importing common certificates `%s'\n"
 msgid "importing common certificates '%s'\n"
 msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, fuzzy, c-format
 #| msgid "can't sign using `%s': %s\n"
 msgid "can't sign using '%s': %s\n"
 msgstr "`%s' kullanarak imzalanamıyor: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "geçersiz komut (hiç dolaylı komut yok)\n"
@@ -9888,7 +9898,7 @@ msgstr "saklanmış bayraklar alınırken hata: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "sertifika ithal edilirken hata: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "girdi okunurken hata: %s\n"
@@ -9930,7 +9940,7 @@ msgstr "sertifika yeniden aranırken sorun çıktı: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "bayraklar saklanırken hata: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Hata - "
 
@@ -10345,12 +10355,6 @@ msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "%s kapanırken hata: %s\n"
 
-#: dirmngr/crlcache.c:948
-#, fuzzy, c-format
-#| msgid "error reading `%s': %s\n"
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "\"%s\" okunurken hata: %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, fuzzy, c-format
 #| msgid "can't access `%s': %s\n"
@@ -11104,101 +11108,101 @@ msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 msgid "usage: %s [options] "
 msgstr "kullanımı: gpgsm [seçenekler] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, fuzzy, c-format
 #| msgid "%s not allowed with %s!\n"
 msgid "colons are not allowed in the socket name\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, fuzzy, c-format
 #| msgid "renaming `%s' to `%s' failed: %s\n"
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, fuzzy, c-format
 #| msgid "conversion from `%s' to `%s' failed: %s\n"
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "`%s' > `%s' dönüşümü başarısız: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, fuzzy, c-format
 #| msgid "line too long - skipped\n"
 msgid "%s:%u: line too long - skipped\n"
 msgstr "satır çok uzun - atlandı\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, fuzzy, c-format
 #| msgid "invalid fingerprint"
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "parmakizi geçersiz"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, fuzzy, c-format
 #| msgid "read error in `%s': %s\n"
 msgid "%s:%u: read error: %s\n"
 msgstr "`%s' için okuma hatası: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, fuzzy, c-format
 #| msgid "not forced"
 msgid "shutdown forced\n"
 msgstr "zorlanmadı"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr ""
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr ""
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, fuzzy, c-format
 #| msgid "error running `%s': exit status %d\n"
 msgid "error accessing '%s': http status %u\n"
 msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr ""
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, fuzzy, c-format
 #| msgid "too many cipher preferences\n"
 msgid "too many redirections\n"
 msgstr "çok fazla şifreleme tercihi\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to `%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11609,63 +11613,63 @@ msgstr "sertifika iyi durumda\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "sertifika imzalama için kullanılmamalıydı\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "sessiz"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr "veri çıktısını onaltılık kodlamayla basar"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr "alınan veri satırlarının kodunu açar"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "connect to the dirmngr"
 msgstr "dirmngr'a bir komut aktarır"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 #, fuzzy
 #| msgid "pass a command to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "dirmngr'a bir komut aktarır"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 #, fuzzy
 #| msgid "|NAME|connect to Assuan socket NAME"
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|İSİM|Assuan soketi İSİMe bağlanır"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr "komut satırında verilen Assuan sunucu çalıştırılır"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr "ek bağlantı kipi kullanılmaz"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|DOSYA|DOSYAdaki komutlar başlangıçta çalıştırılır"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr "/subst başlangıçta çalıştırılır"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 #, fuzzy
 #| msgid "Usage: gpg-connect-agent [options] (-h for help)"
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Kullanımı: gpg-connect-agent [seçenekler] (yardım için -h)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 #, fuzzy
 #| msgid ""
 #| "Syntax: gpg-connect-agent [options]\n"
@@ -11677,50 +11681,50 @@ msgstr ""
 "Sözdizimi: gpg-connect-agent [seçenekler]\n"
 "Çalışan bir aracıya bağlanıp komutları gönderir\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "\"%s\" seçeneği bir program ve seçimlik değiştirgeler gerektirir\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "\"%2$s\" nedeniyle \"%1$s\" seçeneği yoksayıldı\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "satır alımı başarısız: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "satır çok uzun - atlandı\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "gömülü boş karakterden dolayı satır kısaldı\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, fuzzy, c-format
 #| msgid "unknown command `%s'\n"
 msgid "unknown command '%s'\n"
 msgstr "komut `%s' bilinmiyor\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "satır göndirimi başarısız: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "standart seçenekler gönderilirken hata: %s\n"
@@ -11788,13 +11792,13 @@ msgstr "%s bileşeninin harici doğrulaması başarısız oldu"
 msgid "Note that group specifications are ignored\n"
 msgstr "Grup belirtimlerinin yoksayıldığına dikkat edin\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 #| msgid "error closing %s: %s\n"
 msgid "error closing '%s'\n"
 msgstr "%s kapanırken hata: %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 #| msgid "error in `%s': %s\n"
 msgid "error parsing '%s'\n"
@@ -12002,6 +12006,14 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "geçeci dosyaya yazma hatası: %s\n"
+
+#, fuzzy
+#~| msgid "run in server mode"
+#~ msgid "run in supervised mode"
+#~ msgstr "sunucu kipinde çalışır"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
@@ -12349,9 +12361,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "%s yazmak için açılamadı: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "%s yazılırken hata: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "%s kapanırken hata: %s\n"
 
diff --git a/po/uk.gmo b/po/uk.gmo
index 43969dd..d8e2fe1 100644
--- a/po/uk.gmo
+++ b/po/uk.gmo
diff --git a/po/uk.po b/po/uk.po
index 0503c1c..9b15082 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2020-08-31 11:54+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2);\n"
 "X-Generator: Lokalize 20.11.70\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "не вдало�� в�тановити блокуванн� запи�у пінкоду: %s\n"
@@ -30,49 +30,49 @@ msgstr "не вдало�� в�тановити блокуванн� запи�
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "_Гаразд"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "_Ска�увати"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "_Так"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "_�і"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "Пінкод:"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "_Зберегти у за�обі керуванн� парол�ми"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "Справді хочете зробити пароль видимим на екрані?"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "Зробити пароль видимим"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "Приховати пароль"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -94,14 +94,14 @@ msgstr ""
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -109,7 +109,7 @@ msgstr "Занадто довгий пароль"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "Які�ть:"
 
@@ -119,13 +119,13 @@ msgstr "Які�ть:"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Які�ть введеного вище тек�ту.\n"
 "Дані щодо критеріїв �ко�ті можна отримати у вашого адміні�тратора."
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -133,7 +133,7 @@ msgstr ""
 "Будь ла�ка, вкажіть ваш пінкод, щоб ключ можна було розблокувати дл� цього "
 "�еан�у"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -141,76 +141,76 @@ msgstr ""
 "Будь ла�ка, вкажіть ваш пароль, щоб ключ можна було розблокувати дл� цього "
 "�еан�у"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr "Пінкод:"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "Пароль:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "паролі не збігають��, повторіть �пробу"
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (�проба %d з %d)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr "Повторіть:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 msgid "PIN too long"
 msgstr "Занадто довгий пінкод"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 msgid "Passphrase too long"
 msgstr "Занадто довгий пароль"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 msgid "Invalid characters in PIN"
 msgstr "�екоректні �имволи у пінкоді"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr "Занадто короткий пінкод"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad PIN"
 msgstr "Помилковий пінкод"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad Passphrase"
 msgstr "Помилковий пароль"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "Будь ла�ка, повторіть введенн� парол�"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, 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:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -234,24 +234,24 @@ msgstr ""
 "підтримки ключів ssh, що �кладають�� з понад %d бітів, не передбачено\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, 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
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, 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:2513
+#: agent/command-ssh.c:2467
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "помилка під ча� �проби отриманн� �пи�ку карток: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, 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:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr "�адати"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr "Заборонити"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "Будь ла�ка, вкажіть пароль до ключа ssh%%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -297,89 +297,81 @@ msgstr ""
 "Будь ла�ка, вкажіть пароль дл� захи�ту отриманого закритого ключа%%0A   %s"
 "%%0A   %s%%0Aу �ховищі ключів gpg-agent"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "не вдало�� �творити потік даних з �окета: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "Будь ла�ка, в�тавте картку з �ерійним номером"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "�дміні�тративний пінкод"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "Код �киданн�"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0AСкори�тайте�� додатковою клавіатурою зчитувача дл� введенн�."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "Повторіть введенн� цього коду �киданн�"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "Повторіть введенн� цього PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "Повторіть введенн� цього пінкоду"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "Помилка під ча� повторного введенн� коду �киданн�, повторіть �пробу"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "Помилка під ча� повторного введенн� PUK, повторіть �пробу"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "Помилка під ча� повторного введенн� пінкоду, повторіть �пробу"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Будь ла�ка, введіть пінкод%s%s%s дл� розблокуванн� картки"
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "помилка �творенн� тимча�ового файла: %s\n"
-
-#: agent/genkey.c:150
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "помилка під ча� �проби запи�у до тимча�ового файла: %s\n"
+#: agent/genkey.c:154
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "помилка під ча� запи�у до %s: %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 msgid "Enter new passphrase"
 msgstr "Вкажіть новий пароль"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "Вами не вказано парол�!%0AВикори�танн� порожніх паролів заборонено."
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -388,11 +380,11 @@ msgstr ""
 "Вами не вказано парол�. Цього не варто робити!%0AБудь ла�ка, підтвердіть, що "
 "ваш ключ не �лід захищати взагалі."
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr "Так, у захи�ті немає потреби"
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
@@ -400,7 +392,7 @@ msgstr[0] "Пароль має Ñ�кладатиÑ�Ñ� принаймні з %u Ñ�Ð
 msgstr[1] "Пароль має �кладати�� принаймні з %u �имволів."
 msgstr[2] "Пароль має �кладати�� принаймні з %u �имволів."
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
@@ -409,241 +401,237 @@ msgstr[0] "У паролі має бути принаймні %u цифра аб
 msgstr[1] "У паролі має бути принаймні %u цифри або%%0A�пеціальних �имволи."
 msgstr[2] "У паролі має бути принаймні %u цифр або%%0A�пеціальних �имволів."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr ""
 "Паролем не повинно бути �лово зі �ловника або �лово%%0A, що відповідає "
 "певному зразку."
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "Попередженн�: вами вказано не�кладний пароль."
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 msgid "Take this one anyway"
 msgstr "Скори�тати�� цим"
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "Вкажіть пароль до%0Aз метою захи�ту вашого нового ключа"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 msgid "Please enter the new passphrase"
 msgstr "Вкажіть новий пароль"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "Параметри діагно�тики"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr "запу�тити у режимі фонової �лужби (фоновий)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr "запу�тити у режимі �ервера (о�новному)"
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-msgid "run in supervised mode"
-msgstr "запу�тити у режимі із нагл�дом"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr "не від’єднувати від кон�олі"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr "виведенн� команд у форматі sh"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr "виведенн� команд у форматі csh"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|прочитати параметри з вказаного файла"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr "Параметри керуванн� діагно�тичним виводом"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "докладний режим"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "дещо зменшити кількі�ть повідомлень"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|запи�увати журнал режиму �ервера до файла"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr "Параметри керуванн� налаштуванн�ми"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "не викори�товувати SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|викори�товувати вказану програму SCdaemon"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|викори�товувати вказану програму SCdaemon"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|приймати певні команди через NAME"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "ігнорувати запити щодо зміни TTY"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "ігнорувати запити щодо зміни графічного ди�пле�"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "увімкнути підтримку ssh"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|�ЛГО|викори�тати алгоритм �ЛГО дл� показу відбитків ssh"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "увімкнути підтримку putty"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "Параметри керуванн� захи�том"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|вважати кешовані пінкоди за вказану кількі�ть �екунд"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|завершувати �трок дії ключів SSH за N �екунд"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|в�тановити мак�имальний �трок дії кешу пінкодів у �екундах"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|в�тановити мак�имальний �трок дії ключа SSH у �екундах"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr "не викори�товувати кеш пін-кодів дл� підпи�уванн�"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 msgid "disallow the use of an external password cache"
 msgstr "заборонити викори�танн� зовнішнього кешу паролів"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "заборонити клієнтам позначати ключі �к надійні"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 msgid "allow presetting passphrase"
 msgstr "дозволити попереднє в�тановленн� парол�"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr "Параметри приму�ового викори�танн� правил паролів"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr "не дозвол�ти обхід правил паролів"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|в�тановити вказану мінімальну довжину нових паролів"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|вимагати у нових парол�х не менше вказаної кілько�ті нелітер"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|перевір�ти нові паролі за зразком з вказаного файла"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|завершувати �трок дії паролів за вказану кількі�ть днів"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 msgid "do not allow the reuse of old passphrases"
 msgstr "не дозвол�ти повторне викори�танн� �тарих паролів"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "Параметри керуванн� захи�том"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr "заборонити функції виклику перевизначати pinentry"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "не захоплювати керуванн� клавіатурою і мишею"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|викори�товувати вказану програму пінзапи�ів"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|в�тановити вказаний ча� очікуванн� Pinentry у �екундах"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "дозволити запит парол� з Emacs"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Будь ла�ка, над�илайте повідомленн� про помилки на <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "Викори�танн�: @GPG_AGENT@ [параметри] (-h — довідка)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -651,133 +639,138 @@ msgstr ""
 "Синтак�и�: @GPG_AGENT@ [параметри] [команда [аргументи]]\n"
 "Керуванн� закритими ключами у @GNUPG@\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "вказано некоректне значенн� рівн� діагно�тики «%s»\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "вибраний алгоритм побудови контрольних �ум є некоректним\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "прочитати параметри з «%s»\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "З�УВ�ЖЕ��Я: %s не призначено дл� звичайного викори�танн�!\n"
 
-#: agent/gpg-agent.c:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "УВ�Г�: «%s» вважаєть�� за�тарілим параметром\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не вдало�� �творити �окет: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "назва �окета «%s» є надто довгою\n"
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent вже запущено, потреби у запу�ку нової копії немає\n"
 
-#: agent/gpg-agent.c:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "помилка під ча� �проби отриманн� поточного �тану �окета\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "помилка під ча� �проби прив’�зуванн� �окета до «%s»: %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "не вдало�� в�тановити права до�тупу до «%s»: %s\n"
 
-#: agent/gpg-agent.c:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "очікуванн� даних на �океті «%s»\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "не вдало�� �творити каталог «%s»: %s\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "�творено каталог «%s»\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "помилка stat() щодо «%s»: %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "не можна викори�товувати �к домашній каталог «%s»\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr ""
 "помилка під ча� �проби читанн� поточного �тану на файловому де�крипторі %d: "
 "%s\n"
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "запущено обробки 0x%lx дл� файлового де�криптора %d\n"
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "обробник 0x%lx де�криптора файла %d завершив роботу\n"
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "запущено обробник ssh 0x%lx дл� де�криптора файла %d\n"
 
-#: agent/gpg-agent.c:2832
+#: agent/gpg-agent.c:2842
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "обробник ssh 0x%lx де�криптора файла %d завершив роботу\n"
 
-#: agent/gpg-agent.c:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "помилка pth_select: %s — очікуванн� у 1 �\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s зупинено\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "у цьому �еан�і не запущено gpg-agent\n"
@@ -803,7 +796,7 @@ msgstr ""
 "Синтак�и�: gpg-preset-passphrase [параметри] KEYGRIP\n"
 "Керуванн� кешем паролів\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -813,7 +806,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -868,42 +861,42 @@ msgstr "�ка�овано\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "помилка під ча� �проби запиту парол�: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "помилка під ча� відкритт� «%s»: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "файл «%s», р�док %d: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "проігноровано ін�трукцію «%s» у «%s», р�док %d\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "�пи�ок довіри �и�теми «%s» недо�тупний\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "помилковий відбиток у «%s», р�док %d\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "некоректна позначка ключа у «%s», р�док %d\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "помилка під ча� читанн� «%s», р�док %d: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "помилка під ча� читанн� �пи�ку надійних кореневих �ертифікатів\n"
@@ -916,7 +909,7 @@ msgstr "помилка під чаÑ� читаннÑ� Ñ�пиÑ�ку надійниÑ
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -925,11 +918,11 @@ msgstr ""
 "Бажаєте в�тановити аб�олютний рівень довіри до%%0A  «%s»%%0Aз метою належної "
 "�ертифікації �ертифікатів кори�тувача?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 msgid "Yes"
 msgstr "Так"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr "�і"
@@ -942,7 +935,7 @@ msgstr "�і"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -954,21 +947,26 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr "Підтверджую"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr "�е підтверджую"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "помилка під ча� �проби перейменуванн� «%s» на «%s»: %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr ""
 "Зауваженн�: цей пароль ще не змінював��.%0AБудь ла�ка, змініть його зараз."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
@@ -977,15 +975,29 @@ msgstr ""
 "Цей пароль не змінював��%%0Aз %.4s-%.2s-%.2s.  Будь ла�ка, змініть його "
 "зараз."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 msgid "Change passphrase"
 msgstr "Змінити пароль"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr "Я зміню його пізніше"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+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?"
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+"Проце�ом ssh наді�лано запит щодо викори�танн� ключа%%0A  %s%%0A  "
+"(%s)%%0A�адати до�туп до цього ключа?"
+
+#: agent/findkey.c:1741
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -993,11 +1005,11 @@ msgid ""
 msgstr ""
 "Справді хочете вилучити ключ, що визначаєть�� keygrip%%0A  %s%%0A  %%C%%0A?"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 msgid "Delete key"
 msgstr "Вилучити ключ"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1022,7 +1034,7 @@ msgstr "Ключ %s викори�товує недо�татньо міцний
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%zu-бітовий хеш не є коректним дл� %u-бітового ключа %s\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "невдала �проба перевірити �творений підпи�: %s\n"
@@ -1062,7 +1074,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "помилка під ча� �проби розгалужуванн� проце�у: %s\n"
@@ -1124,12 +1136,12 @@ msgstr "Увага: визначенн� вла�ника не є безпечн
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "Увага: визначенн� прав до�тупу не є безпечним дл� %s — «%s»\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:880
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "очікуємо на отриманн� до�тупу до файла «%s»…\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "�проба перейменуванн� «%s» на «%s» зазнала невдачі: %s\n"
@@ -1352,7 +1364,7 @@ msgid "algorithm: %s"
 msgstr "алгоритм: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "непідтримуваний алгоритм: %s"
@@ -1507,7 +1519,7 @@ msgstr "перетворенн� з «%s» у «%s» недо�тупне\n"
 msgid "iconv_open failed: %s\n"
 msgstr "помилка iconv_open: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "помилка перетворенн� з «%s» у «%s»: %s\n"
@@ -1546,7 +1558,7 @@ msgstr "блокуванн� «%s» не виконано: %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "очікуванн� на блокуванн� %s…\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s є занадто за�тарілою (потрібно %s, маємо %s)\n"
@@ -1715,7 +1727,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "у цьому �еан�і не запущено dirmngr\n"
@@ -1760,7 +1772,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "�творити �ертифікат відкликанн�"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1788,7 +1800,7 @@ msgstr "це не можна робити у пакетному режимі\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Цією командою можна кори�тувати�� лише дл� карток вер�ії 2\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "�емає коду �киданн� або код �киданн� вже недо�тупний\n"
@@ -1854,14 +1866,14 @@ msgstr "�дре�а дл� отриманн� відкритого ключа:
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "помилка під ча� �проби читанн� «%s»: %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
@@ -2205,26 +2217,26 @@ msgstr "Команди адміні�труванн� заборонено\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�екоректна команда  (�кори�тайте�� командою «help»)\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output не працює з цією командою\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "не вдало�� відкрити «%s»\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ «%s» не знайдено: %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2283,8 +2295,8 @@ msgid "subkey"
 msgstr "підключ"
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "помилка оновленн�: %s\n"
@@ -2347,14 +2359,14 @@ msgstr "алгоритм шифруваннÑ� «%s» не можна викорÐ
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм шифруванн� «%s» не можна викори�товувати у режимі %s\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 sm/sign.c:597 sm/verify.c:510
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr ""
@@ -2379,7 +2391,7 @@ msgstr ""
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "УВ�Г�: ключ %s не можна викори�товувати дл� шифруванн� у режимі %s\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2487,12 +2499,12 @@ msgstr "екÑ�портуваннÑ� закритих ключів заборонÐ
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "ключ %s: ключ у �тилі PGP 2.x — пропущено\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "УВ�Г�: нічого не ек�портовано\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, c-format
 msgid "error creating '%s': %s\n"
@@ -2558,287 +2570,287 @@ msgstr ""
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "викори�товуємо підключ %s замі�ть о�новного ключа %s\n"
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "коректні значенн� параметра «%s»:\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 msgid "make a signature"
 msgstr "�творити підпи�"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "make a clear text signature"
 msgstr "�творити тек�товий підпи�"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "�творити від’єднаний підпи�"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "зашифрувати дані"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "шифрувати лише за допомогою �иметричного шифру"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "розшифрувати дані (типова ді�)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "перевірити підпи�"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "показати �пи�ок ключів"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "показати �пи�ок ключів і підпи�ів"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr "показати �пи�ок і перевірити підпи�и ключів"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "показати �пи�ок ключів і відбитків"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "показати �пи�ок закритих ключів"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "�творити пару ключів"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 msgid "quickly generate a new key pair"
 msgstr "швидке �творенн� пари ключів"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "quickly add a new user-id"
 msgstr "швидке додаванн� нового ідентифікатора кори�тувача"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 msgid "quickly revoke a user-id"
 msgstr "швидке відкликанн� ідентифікатора кори�тувача"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly set a new expiration date"
 msgstr "швидке в�тановленн� нової дати завершенн� �троку дії"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr "повноцінне �творенн� пари ключів"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "�творити �ертифікат відкликанн�"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "вилучити ключі з відкритого �ховища ключів"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "вилучити ключів з закритого �ховища ключів"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "quickly sign a key"
 msgstr "швидко підпи�ати ключ"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "quickly sign a key locally"
 msgstr "швидко підпи�ати ключ локально"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "quickly revoke a user-id"
 msgid "quickly revoke a key signature"
 msgstr "швидке відкликанн� ідентифікатора кори�тувача"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "підпи�ати ключ"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "підпи�ати ключ локально"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "підпи�ати або редагувати ключ"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "змінити пароль"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "ек�портувати ключі"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "ек�портувати ключі на �ервер ключів"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "імпортувати ключі з �ервера ключів"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "шукати ключі на �ервері ключів"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "оновити в�і ключів з �ервера ключів"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "імпортувати/об’єднати ключі"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr "показати дані про �тан картки"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr "змінити дані на картці"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr "змінити пінкод картки"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "оновити базу даних довіри"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid "print message digests"
 msgstr "показати контрольні �уми повідомлень"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "запу�тити у режимі �ервера"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|в�тановити вказане правило TOFU дл� ключа"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|викори�товувати вказаний типовий закритий ключ"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|шифрувати також до вказаного ідентифікатора кори�тувача"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|в�тановити замінники адре�и електронної пошти"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr "�трого викори�товувати �тандарт OpenPGP"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "не вно�ити змін"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "запитувати перед перезапи�ом"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "Параметри керуванн� захи�том"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "Параметри керуванн� діагно�тичним виводом"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "�творити дані у форматі ASCII"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|запи�ати дані до вказаного файла"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "викори�товувати канонічний тек�товий режим"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|в�тановити рівень �ти�ненн� (0 — вимкнути)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
 msgstr "Параметри керуванн� інтерактивні�тю та приму�ом"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr ""
 "|MECHANISMS|викори�товувати вказаний механізм дл� пошуку ключів за адре�ою"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "імпортувати ключі з �ервера ключів"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "показати �пи�ок і перевірити підпи�и ключів"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "заборонити до�туп до dirmngr"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "Параметри керуванн� налаштуванн�ми"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "показати �пи�ок закритих ключів"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|зашифрувати дл� вказаного ідентифікатора"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "|USER-ID|викори�товувати дл� �творенн� підпи�ів або розшифруванн� вказаний "
 "ідентифікатор"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2847,7 +2859,7 @@ msgstr ""
 "(Щоб ознайомити�� зі �пи�ком команд і параметрів, �кори�тайте�� �торінкою "
 "довідника (man))\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2868,11 +2880,11 @@ msgstr ""
 " --list-keys [назви]        показати ключі\n"
 " --fingerprint [назви]      показати відбитки\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "Викори�танн�: @GPG@ [параметри] [файли] (-h — довідка)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2882,7 +2894,7 @@ msgstr ""
 "Підпи�уванн�, перевірка підпи�ів, шифруванн� або розшифруванн�\n"
 "Типова ді� залежатиме від вхідних даних\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2890,77 +2902,77 @@ msgstr ""
 "\n"
 "Підтримувані алгоритми:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "Відкритий ключ: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "Шифр: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "Хеш: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "Сти�ненн�: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "кори�туванн�: %s [параметри] %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "не�умі�ні команди\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "у визначенні групи «%s» немає знаку «=»\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "УВ�Г�: визначенн� вла�ника домашнього каталогу «%s» не є безпечним\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "УВ�Г�: визначенн� вла�ника у файлі налаштувань «%s» не є безпечним\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "УВ�Г�: визначенн� вла�ника додатка «%s» не є безпечним\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до домашнього каталогу «%s» не є безпечним\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до файла налаштувань «%s» не є безпечним\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "УВ�Г�: визначенн� прав до�тупу до додатка «%s» не є безпечним\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� вла�ника підлеглого каталогу домашнього каталогу «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
@@ -2968,21 +2980,21 @@ msgstr ""
 "УВ�Г�: визначенн� вла�ника у підлеглому каталозі, визначеному файлом "
 "налаштувань «%s», не є безпечним\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� вла�ника підлеглого каталогу у додатку «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до підлеглого каталогу домашнього каталогу "
 "«%s» не є безпечним\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
@@ -2990,490 +3002,490 @@ msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до підлеглого каталогу, визначеного файлом "
 "налаштувань «%s», не є безпечним\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr ""
 "УВ�Г�: визначенн� прав до�тупу до підлеглого каталогу у додатку «%s» не є "
 "безпечним\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "невідомий пункт налаштувань «%s»\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr "показувати фотоідентифікатори у �пи�ках ключів"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 msgid "show key usage information during key listings"
 msgstr "показувати дані щодо викори�танн� ключа у �пи�ках ключів"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr "показувати адре�и правил у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 msgid "show all notations during signature listings"
 msgstr "показувати в�і примітки у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr "показувати �тандартні примітки IETF у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr "показувати примітки кори�тувача у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показувати адре�и о�новних �ерверів ключів у �пи�ках підпи�ів"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr "показувати чинні�ть ідентифікаторів кори�тувачів у �пи�ках ключів"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 "показувати відкликані та за�тарілі ідентифікатори кори�тувачів у �пи�ках "
 "ключів"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показувати відкликані та за�тарілі підключі у �пи�ках ключів"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 msgid "show the keyring name in key listings"
 msgstr "показувати назву �ховища ключів у �пи�ках ключів"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 msgid "show expiration dates during signature listings"
 msgstr "показувати дати завершенн� �троків дії у �пи�ку підпи�ів"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "невідомі правила TOFU «%s»\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "(команда «help» виводить �пи�ок можливих варіантів)\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Цією командою не можна кори�тувати�� у режимі %s.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "З�УВ�ЖЕ��Я: %s не призначено дл� звичайного викори�танн�!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "«%s» не є коректним запи�ом завершенн� �троку дії підпи�у\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "«%s» не є коректною адре�ою електронної пошти\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "некоректний режим pinentry, «%s»\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "некоректне походженн� запиту «%s»\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "«%s» не є коректним набором �имволів\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "не вдало�� обробити адре�у �ервера ключів\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: некоректні параметри �ервера ключів\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "некоректні параметри �ервера ключів\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: некоректні параметри імпортуванн�\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "некоректні параметри імпортуванн�\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "некоректний параметр фільтруванн�: %s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: некоректні параметри ек�портуванн�\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "некоректні параметри ек�портуванн�\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: некоректні параметри побудови �пи�ку\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr "некоректні параметри побудови �пи�ку\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr "показувати фотоідентифікатори під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr "показувати адре�и правил під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 msgid "show all notations during signature verification"
 msgstr "показувати в�і примітки під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr "показувати �тандартні примітки IETF під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr "показувати вказані кори�тувачем примітки під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "показувати адре�и о�новних �ерверів ключів у �пи�ках перевірки підпи�ів"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 msgid "show user ID validity during signature verification"
 msgstr ""
 "показувати чинні�ть ідентифікаторів кори�тувача під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "показувати відкликані та за�тарілі ідентифікатори кори�тувачів у �пи�ках "
 "перевірки підпи�ів"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 "показувати лише о�новний ідентифікатор кори�тувача під ча� перевірки підпи�ів"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: некоректні параметри перевірки\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr "некоректні параметри перевірки\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не вдало�� в�тановити шл�х дл� запу�ку у значенн� %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: некоректний �пи�ок auto-key-locate\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "некоректний �пи�ок auto-key-locate\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "некоректний аргумент параметра «%.50s»\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "УВ�Г�: можливе �творенн� дампу пам’�ті програми!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "УВ�Г�: %s перевизначає %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не можна викори�товувати разом з %s!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s є зайвим, �кщо викори�тано %s!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "УВ�Г�: запущено з фіктивним �и�темним ча�ом: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не буде запущено з помилками у захи�ті пам’�ті через %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "вибраний алгоритм шифруванн� є некоректним\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "вибраний алгоритм побудови контрольних �ум є некоректним\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "вибраний алгоритм �ти�канн� є некоректним\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "вибраний алгоритм �творенн� контрольних �ум дл� �ертифікації є некоректним\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "значенн� completes-needed має бути більшим за 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "значенн� marginals-needed має перевищувати 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "значенн� max-cert-depth має перебувати у діапазоні від 1 до 255\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "некоректне значенн� default-cert-level; має бути 0, 1, 2 або 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "некоректне значенн� min-cert-level; має бути 1, 2 або 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "З�УВ�ЖЕ��Я: наполегливо не рекомендуємо вам кори�тувати�� про�тим режимом "
 "S2K (0)\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "некоректний режим S2K; мало бути вказано 0, 1 або 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "некоректні типові параметри\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "некоректні о�оби�ті параметри шифруванн�\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "некоректні о�оби�ті параметри шифруванн�\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "некоректні о�оби�ті параметри контрольної �уми\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "некоректні о�оби�ті параметри �ти�канн�\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "некоректний розмір ключа; викори�товуємо %u-бітовий\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ще не може працювати разом з %s\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 #| msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм шифруванн� «%s» не можна викори�товувати у режимі %s\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "алгоритм �ти�канн� «%s» не можна викори�товувати у режимі %s\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "не вдало�� ініціалізувати базу даних надійно�ті (TrustDB): %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "УВ�Г�: отримувачів (-r) вказано без викори�танн� шифруванн� відкритим "
 "ключем\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "помилка під ча� �проби �иметричного шифруванн� «%s»: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "не можна викори�товувати комбінацію --symmetric --encrypt у режимі --s2k-"
 "mode 0\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr ""
 "не можна викори�товувати комбінацію --symmetric --encrypt у режимі %s\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "не можна викори�товувати комбінацію --symmetric --sign --encrypt у режимі --"
 "s2k-mode 0\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr ""
 "не можна викори�товувати комбінацію --symmetric --encrypt у режимі %s\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "помилка під ча� над�иланн� даних на �ервер ключів: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "помилка під ча� �проби отриманн� даних з �ервера ключів: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "помилка під ча� �проби ек�портуванн� ключа: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "�проба ек�портуванн� ключа ssh зазнала невдачі: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "помилка пошуку на �ервері ключів: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "помилка оновленн� з �ервера ключів: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "помилка перетворенн� з формату ASCII: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "помилка перетворенн� у формат ASCII: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "некоректний алгоритм хешуванн� «%s»\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "помилка під ча� �проби обробки �пецифікації ключа «%s»: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "«%s» не є коректним ідентифікатором ключа, відбитком або кодом\n"
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "УВ�Г�: команд не надано. �амагаємо�� вгадати, що вам потрібно...\n"
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "Почніть вводити ваше повідомленн�...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "вказана адре�а правил �ертифікації є некоректною\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "вказана адре�а правил підпи�уванн� є некоректною\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "вказана адре�а о�новного �ервера ключів є некоректною\n"
@@ -3486,7 +3498,7 @@ msgstr "|FILE|визначити ключі з файла Ñ�ховища клюÑ
 msgid "make timestamp conflicts only a warning"
 msgstr "�упроводжувати конфлікти ча�ових позначок лише попередженн�ми"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|запи�увати до де�криптора файла дані щодо �тану"
 
@@ -4218,7 +4230,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ви певні, що в�е ще бажаєте підпи�ати його? (y/N або т/�) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  �еможливо підпи�ати.\n"
 
@@ -4393,8 +4405,8 @@ msgstr "Цей ключ ретельно перевірено мною.\n"
 msgid "Really sign? (y/N) "
 msgstr "Підпи�ати? (y/N або т/�) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "помилка під ча� �проби підпи�уванн�: %s\n"
@@ -4599,7 +4611,7 @@ msgstr ""
 "  «t» дл� надійних підпи�ів (tsign), «nr» дл� підпи�ів без відкликанн�\n"
 "  (nrsign) або будь-�ку комбінацію (ltsign, tnrsign тощо).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "Ключ відкликано."
 
@@ -4647,7 +4659,7 @@ msgstr "Вилучити цей ідентифікатор кориÑ�тувачÐ
 msgid "Really move the primary key? (y/N) "
 msgstr "Вилучити о�новний ключ? (y/N або т/�) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr "Вам �лід вибрати лише один ключ.\n"
 
@@ -4724,166 +4736,166 @@ msgstr "Зберегти зміни? (y/N або т/�) "
 msgid "Quit without saving? (y/N) "
 msgstr "Вийти без збереженн�? (y/N або т/�) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "Ключ не змінено, отже оновленн� непотрібне.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "�е можна вилучати о�танній ідентифікатор кори�тувача!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "revoking the user ID failed: %s\n"
 msgstr "помилка перевірки �пи�ку довіри: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "setting the primary user ID failed: %s\n"
 msgstr "помилка перевірки �пи�ку довіри: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "«%s» не є відбитком\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "«%s» не є о�новним відбитком\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "�екоректний ідентифікатор кори�тувача «%s»: %s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "No matching user IDs."
 msgstr "�емає відповідних ідентифікаторів кори�тувачів."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "Nothing to sign.\n"
 msgstr "�ічого підпи�увати.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "�е підпи�ано вами.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "невдала �проба перевірити �творений підпи�: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "«%s» не є коректним запи�ом завершенн� �троку дії\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "«%s» не є належним відбитком\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "не знайдено підключ «%s»\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "Контрольна �ума: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "Можливо�ті: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr "Сервер ключів без можливо�ті зміни"
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr "О�новний �ервер ключів: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 msgid "Notations: "
 msgstr "Примітки: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Переваг дл� ідентифікаторів кори�тувачів у форматі PGP 2.x не передбачено.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "Вказаний нижче ключ було відкликано %s %s ключем %s\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Цей ключ може бути відкликано %s ключем %s"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr "(важливий)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "�творено: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr "відкликано: %s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr "не діє з: %s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "діє до: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr "викори�танн�: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr "номер картки: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr "надійні�ть: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr "чинні�ть: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "Цей ключ було вимкнено"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4891,17 +4903,17 @@ msgstr ""
 "Зауважте, що показані дані щодо чинно�ті ключів не обов’�зково є коректними\n"
 "до перезапу�ку програми.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr "відкликано"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "збіг �трок дії"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4912,17 +4924,17 @@ msgstr ""
 "              цієї команди можна зробити о�новним інший ідентифікатор "
 "кори�тувача.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "УВ�Г�: �трок дії вашого підключа імпортуванн� невдовзі завершить��.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "Ймовірно, вам варто змінити також і його �трок дії.\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4932,35 +4944,37 @@ msgstr ""
 "до відмови\n"
 "         у викори�танні цього ключа де�кими вер�і�ми PGP.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ви �правді бажаєте додати його? (y/N або т/�) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "�е можна додавати фотоідентифікатор до ключа у форматі PGP2.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "У цьому ключі вже і�нує такий ідентифікатор кори�тувача!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Вилучити цей дій�ний підпи�? (y/N/q або т/�/в)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Вилучити цей некоректний підпи�? (y/N/q або т/�/в)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Вилучити цей невідомий підпи�? (y/N/q або т/�/в)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Вилучити цей �амопідпи�? (y/N або т/�)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
@@ -4968,20 +4982,20 @@ msgstr[0] "Вилучено %d підпи�.\n"
 msgstr[1] "Вилучено %d підпи�и.\n"
 msgstr[2] "Вилучено %d підпи�ів.\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "�ічого не вилучено.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "некоректний"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Ідентифікатор кори�тувача «%s» ущільнено: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgid_plural "User ID \"%s\": %d signatures removed\n"
@@ -4989,17 +5003,17 @@ msgstr[0] "Ідентифікатор кориÑ�тувача «%s»: вилучÐ
 msgstr[1] "Ідентифікатор кори�тувача «%s»: вилучено %d підпи�ів\n"
 msgstr[2] "Ідентифікатор кори�тувача «%s»: вилучено %d підпи�ів\n"
 
-#: g10/keyedit.c:4467
+#: g10/keyedit.c:4523
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Ідентифікатор кори�тувача «%s»: вже мінімізовано\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Ідентифікатор кори�тувача «%s»: вже очищено\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -5009,42 +5023,42 @@ msgstr ""
 "призве�ти до відмови\n"
 "         у викори�танні цього ключа де�кими вер�і�ми PGP.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "�е можна додавати підпи�ане відкликанн� до ключа у форматі PGP 2.x.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Вкажіть ідентифікатор кори�тувача підпи�аного відкликанн�: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "не можна призначати ключ у форматі PGP 2.x підпи�аним відкликанн�м\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "не можна призначати ключ вла�ним підпи�аним відкликанн�м\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "цей ключ вже було позначено �к призначений дл� відкликанн�\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "УВ�Г�: призначенн� ключа �к підпи�аного відкликанн� не можна �ка�овувати!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Ви �правді бажаєте призначити цей ключ �к підпи�ане відкликанн�? (y/N або т/"
 "�) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
@@ -5052,176 +5066,176 @@ msgstr ""
 "Ви �правді хочете змінити ча� вичерпанн� �троку дії дл� декількох підключів? "
 "(y/N або т/�) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Зміна ча�у завершенн� �троку дії дл� підключа.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Зміна ча�у завершенн� �троку дії дл� о�новного ключа.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "�е можна змінювати дату завершенн� �троку дії ключа v3\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 msgid "Changing usage of a subkey.\n"
 msgstr "Змінюємо викори�танн� підключа.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 msgid "Changing usage of the primary key.\n"
 msgstr "Змінюємо викори�танн� о�новного підключа.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "підпи�уванн� підключа %s вже перехре�но �ертифіковано\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "підключ %s не призначено дл� підпи�уванн�, отже його не потрібно перехре�но "
 "�ертифікувати\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "Будь ла�ка, виберіть лише один ідентифікатор кори�тувача.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропу�каємо �амопідпи� v3 дл� ідентифікатора кори�тувача «%s»\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr "Вкажіть адре�у вашого о�новного �ервера ключів: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ви �правді бажаєте замінити його? (y/N або т/�) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ви �правді бажаєте вилучити його? (y/N або т/�) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 msgid "Enter the notation: "
 msgstr "Вкажіть примітку: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 msgid "Proceed? (y/N) "
 msgstr "Продовжувати? (y/N або т/�) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ідентифікатора кори�тувача з індек�ом %d не і�нує\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ідентифікатора кори�тувача з хешем %s не і�нує\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "Піключа із ідентифікатором ключа «%s» не і�нує.\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Підключа з індек�ом %d не і�нує\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Ідентифікатор кори�тувача: «%s»\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "підпи�ано вашим ключем %s %s%s%s\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (неек�портовний)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Строк дії цього підпи�у завершуєть�� %s.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ви �правді бажаєте відкликати його? (y/N або т/�) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Створити �ертифікат відкликанн� дл� цього підпи�у? (y/N або т/�) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вами підпи�ано ці ідентифікатори кори�тувачів у ключі %s:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr " (невідкликуваний)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "відкликано вашим ключем %s у %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "Ви маєте намір відкликати ці підпи�и:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Справді �творити �ертифікати відкликанн�? (y/N або т/�) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "немає закритого ключа\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "�проба відкликати ідентифікатор, �кий не належить кори�тувачеві: %s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ідентифікатор кори�тувача «%s» вже відкликано\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "УВ�Г�: підпи� ідентифікатора кори�тувача позначено датою на %d �екунд у "
 "майбутньому\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "�е можна вилучати о�танній ідентифікатор кори�тувача!\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s вже відкликано.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Підключ %s вже відкликано.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ фотоідентифікатора %s розміру %ld дл� ключа %s (uid %d)\n"
@@ -5654,6 +5668,10 @@ msgstr ""
 "Будь ла�ка, не викори�товуйте адре�у електронної пошти у пол�х �правжнього "
 "імені або коментар�\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr "У цьому ключі вже і�нує такий ідентифікатор кори�тувача!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5982,7 +6000,7 @@ msgstr "некоректний протокол Ñ�ервера ключів (нÐ
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "«%s» не є ідентифікатором ключа: пропу�каємо\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
@@ -5990,47 +6008,47 @@ msgstr[0] "оновлюємо %d ключ з %s\n"
 msgstr[1] "оновлюємо %d ключі з %s\n"
 msgstr[2] "оновлюємо %d ключів з %s\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "УВ�Г�: не вдало�� оновити ключ %s за допомогою %s: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ключ «%s» не знайдено на �ервері ключів\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "ключ не знайдено на �ервері ключів\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "над�илаємо запит щодо ключа %s з %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "немає відомих �ерверів ключів\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "пропущено «%s»: %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "над�илаємо ключ %s на %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "над�илаємо запит щодо ключа з «%s»\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "УВ�Г�: не вдало�� отримати адре�у %s: %s\n"
@@ -6065,12 +6083,12 @@ msgstr ""
 "пароль �творено за допомогою невідомого алгоритму �творенн� контрольних �ум "
 "%d\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr "відкритий ключ — %s\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
@@ -6078,238 +6096,238 @@ msgstr ""
 "зашифровано за допомогою %u-бітового %s ключа, ідентифікатор %s, �творено "
 "%s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      «%s»\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключем %s, ідентифікатор %s\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "УВ�Г�: ви�влено декілька фрагментів нешифрованого тек�ту\n"
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано за допомогою %lu паролів\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано за допомогою 1 парол�\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "невдала �проба розшифровуванн� відкритим ключем: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "зашифровані відкритим ключем дані: належний DEK\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "припу�каємо, що дані зашифровано %s\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Шифр IDEA недо�тупний, �пробуємо �кори�тати�� замі�ть нього %s\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "УВ�Г�: цілі�ні�ть повідомленн� не захищено\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "невдала �проба розшифруванн�: %s\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "розшифровано\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "УВ�Г�: зашифроване повідомленн� було змінено!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "невдала �проба розшифруванн�: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "З�УВ�ЖЕ��Я: вимога відправника: «лише дл� Ва�»\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "початкова назва файла=«%.*s»\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "окреме відкликанн� — �кори�тайте�� командою «gpg --import» дл� за�то�уванн�\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, c-format
 msgid "no signature found\n"
 msgstr "підпи�у не знайдено\n"
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПОМИЛКОВИЙ підпи� від «%s»"
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Про�трочений підпи� від «%s»"
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "�алежний підпи� від «%s»"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "перевірку підпи�ів придушено\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "не вдало�� обробити ці дані з неоднозначним підпи�ом\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Підпи� �творено %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               за допомогою %s ключа %s\n"
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Підпи� �творено %s ключем %s з ідентифікатором %s\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               видавець «%s»\n"
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "Ключ до�тупний на: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[непевний]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                або «%s»"
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr ""
 "УВ�Г�: цей ключ не можна викори�товувати дл� підпи�уванн� у режимі %s\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Строк дії підпи�у вичерпано %s\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Підпи� діє до %s\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s підпи�, алгоритм контрольної �уми %s%s%s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "двійковий"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "тек�товий"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "невідомо"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 msgid ", key algorithm "
 msgstr ", алгоритм ключа "
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "УВ�Г�: не відє’днаний підпи�; файл «%s» не було перевірено!\n"
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�е вдало�� перевірити підпи�: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "не є від’єднаним підпи�ом\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "УВ�Г�: ви�влено кратні підпи�и. Буде перевірено лише перший.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "окремий підпи� кла�у 0x%02x\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "підпи� у за�тарілому форматі (PGP 2.x)\n"
@@ -6385,11 +6403,6 @@ msgstr "(подальша інформаці�: "
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: за�тарілий параметр «%s»\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "УВ�Г�: «%s» вважаєть�� за�тарілим параметром\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7489,133 +7502,133 @@ msgstr "помилка читанн� у «%s»: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "trustdb: помилка �инхронізації: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "не вдало�� �творити блокуванн� дл� «%s»\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "не вдало�� заблокувати «%s»\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "запи� trustdb %lu: помилка lseek: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "запи� trustdb %lu: помилка запи�у (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "занадто велика операці� trustdb\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: каталогу не і�нує!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "немає до�тупу до «%s»: %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: не вдало�� �творити запи� щодо вер�ії: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: �творено некоректну trustdb\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: �творено trustdb\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "З�УВ�ЖЕ��Я: запи� до trustdb заборонено\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: некоректна trustdb\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: не вдало�� �творити таблицю хешів: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: помилка оновленн� запи�у вер�ії: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: помилка читанн� запи�у вер�ії: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: помилка запи�уванн� запи�у вер�ії: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: помилка lseek: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: помилка читанн� (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: не є файлом trustdb\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: запи� вер�ії з номером запи�у %lu\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: некоректна вер�і� файла %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: помилка під ча� �проби читанн� вільного запи�у: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: помилка запи�уванн� запи�у каталогу (dir): %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: не вдало�� обнулити запи�: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: не вдало�� додати запи�: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "Помилка: trustdb пошкоджено.\n"
@@ -8283,16 +8296,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8335,10 +8348,10 @@ msgstr ""
 "|P|Будь ла�ка, вкажіть код розблокуванн� пінкоду (PUK) дл� �тандартних "
 "ключів."
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Зворотний виклик пінкоду повернув повідомленн� про помилку: %s\n"
@@ -8360,57 +8373,57 @@ msgstr "Пінкод длÑ� CHV%d занадто короткий; мінімаÐ
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr "ключ вже і�нує\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "вже �творений ключ буде замінено\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr "�творенн� нового ключа\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, c-format
 msgid "writing new key\n"
 msgstr "запи�уванн� нового ключа\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "не вдало�� зберегти ключ: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "відповідь не мі�тить о�нови чи�ленн� RSA\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "відповідь не мі�тить відкритого показника RSA\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "відповідь не мі�тить відкритого ключа еліптичної кривої\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "зачекайте на завершенн� �творенн� ключа...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr "помилка під ча� �творенн� ключа\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
@@ -8418,12 +8431,12 @@ msgstr[0] "Ñ�твореннÑ� ключа завершено (за %d Ñ�екунÐ
 msgstr[1] "�творенн� ключа завершено (за %d �екунди)\n"
 msgstr[2] "�творенн� ключа завершено (за %d �екунд)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "відповідь не мі�тить даних відкритого ключа\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 "||Будь ла�ка, вкажіть пінкод дл� ключа, призначеного дл� �творенн� �кі�них "
@@ -8431,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:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Вкажіть адміні�тративний пінкод"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|P|Будь ла�ка, вкажіть код розблокуванн� пінкоду (PUK) дл� �тандартних "
 "ключів."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Вкажіть пінкод дл� �тандартних ключів."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 "�е знайдено о�нови чи�ленн� RSA або о�нова чи�ленн� не належить до %d-"
 "бітових\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 "�е ви�тачає відкритого показника RSA або розмірні�ть показника перевищує %d "
 "бітів\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "NullPIN ще не було змінено\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN ще не було змінено\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Вкажіть новий пінкод дл� �тандартних ключів."
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|NP|Будь ла�ка, вкажіть новий код розблокуванн� пінкоду (PUK) дл� "
 "�тандартних ключів."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 "|N|Будь ла�ка, вкажіть новий пінкод дл� ключа, призначеного дл� �творенн� "
 "�кі�них підпи�ів."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8494,7 +8507,7 @@ msgstr ""
 "|NP|Будь ла�ка, вкажіть новий код розблокуванн� пінкоду (PUK) дл� �творенн� "
 "�кі�них підпи�ів."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -8502,27 +8515,27 @@ msgstr ""
 "|P|Будь ла�ка, вкажіть код розблокуванн� пінкоду (PUK) дл� �творенн� �кі�них "
 "підпи�ів."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "помилка під ча� отриманн� нового пінкоду: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "не вдало�� зберегти відбиток: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "не вдало�� зберегти дату �творенн�: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "помилка отриманн� �тану CHV з картки\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "помилка читанн� відкритого ключа: %s\n"
@@ -8530,44 +8543,44 @@ msgstr "помилка читанн� відкритого ключа: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "викори�товуємо типовий пінкод �к %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr ""
 "не вдало�� викори�тати типовий пінкод �к %s: %s — вимикаємо подальше типове "
 "викори�танн�\n"
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 msgid "||Please unlock the card"
 msgstr "||Будь ла�ка, розблокуйте картку"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "Пінкод дл� CHV%d занадто короткий; мінімальна довжина — %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "помилка перевірки CHV%d: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "картку заблоковано!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -8582,20 +8595,20 @@ msgstr[2] ""
 "залишило�� %d �проб визначенн� адміні�тративного пінкоду перед тим, �к "
 "картку буде о�таточно заблоковано\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "до�туп до адміні�тративних команд не налаштовано\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 msgid "||Please enter the PIN"
 msgstr "||Вкажіть пінкод"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Вкажіть код �киданн� коду картки"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Занадто короткий код �киданн�; мінімальна довжина — %d\n"
@@ -8603,79 +8616,79 @@ msgstr "Занадто короткий код Ñ�киданнÑ�; мінімалÑ
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr "|RN|�овий код �киданн�"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr "|AN|�овий адміні�тративний пінкод"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr "|N|�овий пінкод"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||Вкажіть адміні�тративний пінкод та новий адміні�тративний пінкод"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 msgid "||Please enter the PIN and New PIN"
 msgstr "||Вкажіть пінкод та новий пінкод"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr "помилка читанн� даних програми\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "помилка читанн� відбитка DO\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "не вказано ча�ової позначки �творенн�\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 "�е знайдено про�того чи�ла RSA %s або чи�ло не належить до %d-бітових\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, c-format
 msgid "unsupported curve\n"
 msgstr "непідтримувана крива\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "некоректна �труктура картки OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "відбиток на картці не відповідає запитаному\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "карткою не підтримуєть�� алгоритм контрольних �ум %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "вже �творено підпи�ів: %lu\n"
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "перевірку адміні�тративного пінкоду заборонено цією командою\n"
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "не вдало�� отримати до�туп до %s — некоректна картка OpenPGP?\n"
@@ -8695,7 +8708,7 @@ msgstr "|N|Початковий новий пінкод"
 msgid "run in multi server mode (foreground)"
 msgstr "запу�тити у режимі декількох �ерверів (о�новному режимі)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|в�тановити вказаний рівень діагно�тики"
 
@@ -8739,11 +8752,11 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "заборонити викори�танн� команд з адміні�труванн� картки"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "Викори�танн�: @SCDAEMON@ [параметри] (-h — довідка)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8751,24 +8764,24 @@ msgstr ""
 "Синтак�и�: scdaemon [параметри] [команди [аргументи]]\n"
 "Фонова �лужба карток пам’�ті дл� @GNUPG@\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr ""
 "будь ла�ка, �кори�тайте�� параметром «--daemon» дл� запу�ку програми у "
 "фоновому режимі\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "запущено запу�к обробки дл� де�криптора %d\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "роботу обробника дл� де�криптора %d перервано\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -8994,7 +9007,7 @@ msgstr "кореневий Ñ�ертифікат не позначено Ñ�к нÐ
 msgid "checking the trust list failed: %s\n"
 msgstr "помилка перевірки �пи�ку довіри: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "занадто довгий ланцюжок �ертифікації\n"
@@ -9051,7 +9064,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u-бітовий хеш не є коректним дл� %u-бітового ключа %s\n"
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
@@ -9097,42 +9110,42 @@ msgstr ""
 "С/� %s, ідентифікатор 0x%08lX,\n"
 "�творено %s, за�таріває %s.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "не вказано викори�танн� ключа — припу�каємо в�і можливі викори�танн�\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "�ертифікат не мав викори�товувати�� дл� �ертифікації\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "�ертифікат не мав викори�товувати�� дл� підпи�уванн� відповідей OCSP\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "�ертифікат не мав викори�товувати�� дл� шифруванн�\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "�ертифікат не мав викори�товувати�� дл� підпи�уванн�\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "�ертифікат непридатний дл� шифруванн�\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "�ертифікат непридатний дл� підпи�уванн�\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9325,6 +9338,11 @@ msgstr "Створити �амопідпи�аний �ертифікат? (y/N
 msgid "These parameters are used:\n"
 msgstr "Викори�тано ці параметри:\n"
 
+#: sm/certreqgen-ui.c:433
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "помилка �творенн� тимча�ового файла: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr "Створюємо �амопідпи�аний �ертифікат.  "
@@ -9398,126 +9416,126 @@ msgstr "помилка під чаÑ� Ñ�проби вилученнÑ� Ñ�ертиÑ
 msgid "no valid recipients given\n"
 msgstr "не вказано коректних отримувачів\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "list external keys"
 msgstr "показати ключ зовнішніх ключів"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "list certificate chain"
 msgstr "показати ланцюжок �ертифікації"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 msgid "import certificates"
 msgstr "імпортувати �ертифікати"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "export certificates"
 msgstr "ек�портувати �ертифікати"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr "зареє�трувати картку пам’�ті"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr "передати команду dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr "виклик gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "взагалі не викори�товувати термінал"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr "кількі�ть �ертифікатів, �кі �лід включити"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|вз�ти дані щодо правил з вказаного файла"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr "вважати вхідні дані даними у форматі PEM"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr "вважати вхідні дані даними у форматі BASE64"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr "вважати вхідні дані даними у двійковому форматі"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 msgid "create base-64 encoded output"
 msgstr "�творити дані, закодовані у BASE64"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr ""
 "|USER-ID|викори�товувати ідентифікатор кори�тувача �к типовий закритий ключ"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|додати �ховище ключів до �пи�ку �ховищ ключів"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr "�аді�лати запит щодо незнайдених �ертифікатів видавц�"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "викори�товувати вказане кодуванн� дл� паролів PKCS#12"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr "не викори�товувати С�С"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr "не шукати у �пи�ках відкликаних �ертифікатів кореневі �ертифікати"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr "перевір�ти чинні�ть за допомогою OCSP"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr "не перевір�ти правила �ертифікатів"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|викори�товувати вказаний алгоритм шифруванн�"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 "|NAME|викори�товувати вказаний алгоритм обчи�ленн� контрольної �уми "
 "повідомленн�"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "пакетний режим: нічого не запитувати"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "вважати відповіддю на більші�ть питань «так»"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "вважати відповіддю на більші�ть питань «ні»"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|запи�увати журнал перевірки до файла"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "Викори�танн�: @GPGSM@ [параметри] [файли] (-h — довідка)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9528,27 +9546,27 @@ msgstr ""
 "протоколу S/MIME\n"
 "Типова ді� залежатиме від вхідних даних\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "З�УВ�ЖЕ��Я: не вда�ть�� зашифрувати до «%s»: %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "невідома модель перевірки «%s»\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "імпортуємо загальні �ертифікати «%s»\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "підпи�уванн� за допомогою «%s» неможливе: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "некоректна команда (немає не�вної команди)\n"
@@ -9578,7 +9596,7 @@ msgstr "помилка під чаÑ� Ñ�проби отриманнÑ� збереÐ
 msgid "error importing certificate: %s\n"
 msgstr "помилка під ча� �проби імпортуванн� �ертифіката: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "помилка під ча� �проби читанн� вхідних даних: %s\n"
@@ -9619,7 +9637,7 @@ msgstr "проблема з повторним пошуком �ертифіка
 msgid "error storing flags: %s\n"
 msgstr "помилка під ча� �проби збереженн� позначок: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "Помилка - "
 
@@ -9995,11 +10013,6 @@ msgstr "не вдалоÑ�Ñ� Ñ�творити тимчаÑ�овий файл каÑ
 msgid "error closing '%s': %s\n"
 msgstr "помилка під ча� �проби закрити «%s»: %s\n"
 
-#: dirmngr/crlcache.c:948
-#, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "помилка під ча� �проби перейменуванн� «%s» на «%s»: %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
@@ -10687,93 +10700,93 @@ msgstr "коректними рівн�ми зневаджуванн� є: %s\n"
 msgid "usage: %s [options] "
 msgstr "викори�танн�: %s [параметри]"
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "не можна викори�товувати двокрапки у назві �окета\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "помилка під ча� �проби отриманн� CRL з «%s»: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "помилка під ча� обробки CRL з «%s»: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: занадто довгий р�док — пропущено\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: ви�влено некоректний відбиток\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: помилка під ча� читанн�: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: беззмі�товні дані наприкінці р�дка проігноровано\n"
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr ""
 "отримано �игнал SIGHUP — повторне читанн� налаштувань та �порожненн� кешу\n"
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "отримано �игнал SIGUSR2 — дій не визначено\n"
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "отримано �игнал SIGTERM — завершуємо роботу…\n"
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "отримано �игнал SIGTERM — підтримуєть�� %d активних з’єднань\n"
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, c-format
 msgid "shutdown forced\n"
 msgstr "приму�ове завершенн� роботи\n"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "отримано �игнал SIGINT — негайне завершенн� роботи\n"
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "отримано �игнал %d — дій не визначено\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "помилка під ча� �проби до�тупу до «%s»: �тан http %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "�дре�у «%s» пере�пр�мовано до «%s» (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "занадто багато пере�пр�мувань\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -11138,57 +11151,57 @@ msgstr "коректний ланцюжок �ертифікації\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "�ертифікат не мав викори�товувати�� дл� підпи�уванн� CRL\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "без повідомлень"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr "виве�ти дані у ші�тнадц�тковому форматі"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr "декодувати отримані р�дки даних"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr "з’єднати�� з dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 #, fuzzy
 #| msgid "connect to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "з’єднати�� з dirmngr"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|в�тановити з’єднанн� з вказаним �окетом Assuan"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|в�тановити з’єднанн� з �ервером Assuan за вказаною адре�ою"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr "запу�тити �ервер Assuan, вказаний у командному р�дку"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr "не викори�товувати розширений режим з’єднанн�"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|виконати команди з вказаного файла під ча� запу�ку"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr "виконати /subst під ча� запу�ку"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "Викори�танн�: @GPG@-connect-agent [параметри] (-h — довідка)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -11196,51 +11209,51 @@ msgstr ""
 "Синтак�и�: @GPG@-connect-agent [параметри]\n"
 "В�тановити з’єднанн� з запущеним агентом і наді�лати команди\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr ""
 "щоб �кори�тати�� параметром «%s», �лід вказати програму та додаткові "
 "аргументи\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "параметр «%s» проігноровано через «%s»\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "помилка під ча� �проби отриманн� р�дка: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "р�док є надто довгим, його пропущено\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "р�док �корочено через вбудований �имвол Nul\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "невідома команда «%s»\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "помилка над�иланн� р�дка: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 #| msgid "no dirmngr running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr "у цьому �еан�і не запущено dirmngr\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "помилка під ча� �проби над�иланн� �тандартних параметрів: %s\n"
@@ -11304,12 +11317,12 @@ msgstr "Помилка зовнішньої перевірки компоненÑ
 msgid "Note that group specifications are ignored\n"
 msgstr "Зауважте, що �пецифікації груп буде проігноровано\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "помилка під ча� �проби закрити «%s»\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "помилка під ча� �проби обробити «%s»'\n"
@@ -11499,6 +11512,12 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "помилка під ча� �проби запи�у до тимча�ового файла: %s\n"
+
+#~ msgid "run in supervised mode"
+#~ msgstr "запу�тити у режимі із нагл�дом"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "Ім’� не може починати�� з цифри\n"
 
@@ -11846,9 +11865,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "не вдало�� відкрити %s дл� запи�у: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "помилка під ча� запи�у до %s: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "помилка під ча� �проби закрити %s: %s\n"
 
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 1de21f3..c908d9b 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3edfaf0..a003993 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 2.2.27\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2022-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2022-04-14 13:13+0800\n"
 "Last-Translator: bobwxc <bobwxc@yeah.net>\n"
 "Language-Team: None\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 2.4.2\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "获� pinentry �失败: %s\n"
@@ -33,49 +33,49 @@ msgstr "获� pinentry �失败: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|确认(_O)"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|�消(_C)"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|是(_Y)"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|�(_N)"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN："
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|在密�管�器中�存(_S)"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "您真的想�使您的密�在�幕上���？"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|使密���"
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|��密�"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr "大写�定已开�"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr "建议"
 
@@ -86,27 +86,27 @@ msgstr "建议"
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 msgid "pinentry.genpin.tooltip"
 msgstr "使用�机生�的密�"
 
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr "注�：密���许�有空格。"
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 msgid "Passphrase Not Allowed"
 msgstr "��许的密�"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "强度："
 
@@ -116,101 +116,101 @@ msgstr "强度："
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "上方输入的文本的质�。\n"
 "请�管�员咨询详细相关准则。"
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "请输入您的 PIN，从而为此会�解��钥"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "请输入您的密�，从而为此会�解��钥"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr "PIN："
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "密�："
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "�匹� - 请�试"
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s（�试第%d个，共%d个）"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr "��："
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 msgid "PIN too long"
 msgstr "PIN 太长"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 msgid "Passphrase too long"
 msgstr "密�太长"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 msgid "Invalid characters in PIN"
 msgstr "PIN 中�有无效字符"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr "PIN 太短"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad PIN"
 msgstr "错误的 PIN"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad Passphrase"
 msgstr "错误的密�"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr "注�：�自网络�览器的请求。"
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr "注�：�自远程站点的请求。"
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "请�新输入此密�"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, c-format
 msgid ""
 "Please enter the passphrase to protect the imported object within the %s "
 "system."
 msgstr "请输入密�以在 %s 系统内部�护已导入的对象。"
 
-#: agent/command.c:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -222,24 +222,24 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "尚未支�长度超过 %d �的 ssh 密钥\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, 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
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, 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:2513
+#: agent/command-ssh.c:2467
 #, c-format
 msgid "error getting list of cards: %s\n"
 msgstr "获��片列表时出现错误：%s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, c-format
 msgid ""
 "An ssh process requested the use of key%%0A  %s%%0A  (%s)%%0ADo you want to "
 "allow this?"
 msgstr "一个 ssh 进程请求使用密钥%%0A  %s%%0A  (%s)%%0A您想��许这一请求�？"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr "�许"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr "拒�"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "请输入 ssh 密钥 %%0A  %F%%0A  (%c)  的密�"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -283,87 +283,79 @@ msgstr ""
 "请输入一个密�，以便于在 gpg-agent 的密钥存储中�护接收到的�钥 %%0A   %s"
 "%%0A   %s%%0A"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "从以下套接字创建�时失败： %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "请�入具有以下�列�的�"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "管�员 PIN"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PUK"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "�置�"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr "按下�片/令牌上的 ACK 按钮。"
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 msgid "Use the reader's pinpad for input."
 msgstr "使用读�器�键盘输入。"
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "�次输入此�置�"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "�次输入此 PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "�次输入此 PIN"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "�置��次输入时与首次输入�符；请�试"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "PUK �次输入时与首次输入�符；请�试"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN �次输入时与首次输入�符；请�试"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "请输入 PIN%s%s%s 以解�这张�"
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "创建临时文件时出现错误： %s\n"
-
-#: agent/genkey.c:150
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "写入临时文件时出现错误： %s\n"
+#: agent/genkey.c:154
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "写入 %s 时出现错误：%s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 msgid "Enter new passphrase"
 msgstr "输入新的密�"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "您并没有输入一个密��%0A��许密�留空。"
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -372,250 +364,246 @@ msgstr ""
 "您并没有输入一个密� - 这通常�是一个好主��%0A请确认您�想给您的密钥加上任"
 "何的�护。"
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr "是的，�护�是必须的"
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "密�长度应至少为 %u 字符。"
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
 "A passphrase should contain at least %u digits or%%0Aspecial characters."
 msgstr[0] "密�应当包括至少 %u �或者%%0A特殊字符。"
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, c-format
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr "密��应该是一个已知的用语或者与%%0A特定的模�相匹�。"
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "警告：您输入了一个�安全的密�。"
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 msgid "Take this one anyway"
 msgstr "无论如何都使用这个"
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "请输入密�以%0A�护您的新密钥"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 msgid "Please enter the new passphrase"
 msgstr "请输入新的密�"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 msgid "Options used for startup"
 msgstr "用于�动的选项"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr "以守护进程模��行 （��）"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr "以�务进程模��行 （��）"
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-msgid "run in supervised mode"
-msgstr "以管�进程模��行"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr "请勿离开控制�"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr "sh 风格的命令行输出"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr "csh 风格的命令行输出"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|从 FILE 中读�选项"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr "控制诊断输出的选项"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "详细模�"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "尽��少�示信�"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|将�务器模�的日志写入到 FILE"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr "控制�置的选项"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "�使用 SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|使用 PGM 作为 SCdaemon 程�"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|使用 PGM 作为 tpm2daemon 程�"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|通过 NAME 接收一些命令"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "忽略改� TTY 的请求"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "忽略改� X display 的请求"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "�用 ssh 支�"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|使用 ALGO 显示 ssh 指纹"
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "�用 putty 支�"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "控制安全的选项"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|使被缓存的 PIN 在 N 秒�过期"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|在 N 秒�使 SSH 密钥过期"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|设置 PIN 缓存的生命周期为 N 秒"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|设置 SSH 缓存的生命周期为 N 秒"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr "在签�时�使用 PIN 缓存"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 msgid "disallow the use of an external password cache"
 msgstr "�止使用外部的密�缓存"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "�止客户端将密钥标记为“信任�"
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 msgid "allow presetting passphrase"
 msgstr "�许预设置的密�"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr "选项强制�求一个密�策略"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr "��许绕过密�的策略"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|设置�求新密�的最短长度为 N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|�求新密�至少有 N 个�字�字符"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|FILE|按 FILE 中的样�检查新密�"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|在 N 天�使密�过期"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 msgid "do not allow the reuse of old passphrases"
 msgstr "��许�次使用旧的密�"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 msgid "Options controlling the PIN-Entry"
 msgstr "控制 PIN-Entry 的选项"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 msgid "never use the PIN-entry"
 msgstr "�使用 PIN-entry"
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr "�止调用者覆盖 pinentry"
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "�许 PIN-Entry 抓�键盘与鼠标"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|使用 PGM 作为 PIN-Entry 程�"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|设置 Pinentry 的超时时间为 N 秒"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "�行密�通过 Emacs 回显"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "请� <@EMAIL@> 报告程�缺陷。\n"
 "请� <i18n-zh@googlegroups.com> 邮件列表�映简体中文的翻译问题或建议。\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "用法： @GPG_AGENT@ [选项] （-h 获�帮助）"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -623,131 +611,136 @@ msgstr ""
 "语法： @GPG_AGENT@ [选项] [命令 [�数]]\n"
 "@GNUPG@ �钥管�器\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "无效的调试级别‘%s’\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "从‘%s’读�选项\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "注�：‘%s’�被认为是一个选项\n"
 
-#: agent/gpg-agent.c:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "警告：“%s� 是一个已被弃用的选项\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法创建套接字： %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "套接字�称‘%s’太长\n"
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr "正�试从�行的 %s 处夺�套接字\n"
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "有一个 gpg-agent 实例正在�行 - 无须�动新的实例\n"
 
-#: agent/gpg-agent.c:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "获�套接字 nonce 时出现错误\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "绑定套接字到 '%s' 时出现错误： %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "无法设置‘%s’的��： %s\n"
 
-#: agent/gpg-agent.c:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "正在监�套接字‘%s’\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "无法创建目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "目录‘%s’已创建\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "‘%s’的 stat() 方法失败：%s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "无法使用‘%s’作为家目录\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "在读� fd %d 上的 nonce 时出现错误： %s\n"
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "�柄 0x%lx 于文件�述符 %d �动\n"
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "�柄 0x%lx 于文件�述符 %d 终止\n"
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh �柄 0x%lx 于文件�述符 %d �动\n"
 
-#: agent/gpg-agent.c:2832
+#: agent/gpg-agent.c:2842
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh �柄 0x%lx 于文件�述符 %d 终止\n"
 
-#: agent/gpg-agent.c:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect 方法失败：%s - 等待 1s\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已�止\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "此会�中没有 gpg-agent 实例�行\n"
@@ -772,7 +765,7 @@ msgstr ""
 "语法： gpg-preset-passphrase [选项] KEYGRIP\n"
 "密�缓存管�\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -782,7 +775,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -836,42 +829,42 @@ msgstr "已�消\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "请求密�时出现错误： %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "打开‘%s’时出现错误：%s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "文件‘%s’ 的第 %d 行：%s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "已忽略声明 “%s� ，其�于‘%s’的第 %d 行\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "系统信任列表 ‘%s’ ��用\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "错误的指纹，其�于 ‘%s’ 的第 %d 行\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "无效的密钥标记，其�于 ‘%s’ 的第 %d 行\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "读� ‘%s’ 的第 %d 行时出现错误：%s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "读��信任的根�书列表时出现错误\n"
@@ -884,18 +877,18 @@ msgstr "读��信任的根�书列表时出现错误\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr "您�无�地信任%%0A  “%s�%%0A为正确的认�用户�书�?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 msgid "Yes"
 msgstr "是"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr "�"
@@ -908,7 +901,7 @@ msgstr "�"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -918,35 +911,52 @@ msgstr "请确认被识别为%%0A “%s�%%0A的�书具有以下的指纹：%
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr "正确"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr "错误"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "将‘%s’�命�为‘%s’时出现错误：%s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "注�：此密�从未被修改过。%0A请立�修改。"
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr "此密�自从 %.4s-%.2s-%.2s 起未被修改过。%%0A请立�修改。"
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 msgid "Change passphrase"
 msgstr "更改密�"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr "��修改"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+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?"
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr "一个 ssh 进程请求使用密钥%%0A  %s%%0A  (%s)%%0A您想��许这一请求�？"
+
+#: agent/findkey.c:1741
 #, c-format
 msgid ""
 "Do you really want to delete the key identified by keygrip%%0A  %s%%0A  %%C"
@@ -954,11 +964,11 @@ msgid ""
 msgstr ""
 "您真的想�删除这个被以下的 keygrip 所标识的密钥� %%0A  %s%%0A  %%C%%0A？"
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 msgid "Delete key"
 msgstr "删除密钥"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -982,7 +992,7 @@ msgstr "%s 密钥使用了一个�安全的（%u �）散列\n"
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%zu �的散列对于一个 %u �的 %s 密钥无效\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "检查已建立的签�时�生错误： %s\n"
@@ -1021,7 +1031,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "在 fork 进程时出现错误： %s\n"
@@ -1082,12 +1092,12 @@ msgstr "警告： %s 具有�安全的文件所有� “%s�\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告：%s 具有�安全的文件��� “%s�\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:880
 #, c-format
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "等待 ‘%s’ �被访问...\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "将 ‘%s’ �命�为 ‘%s’ 时失败：%s\n"
@@ -1304,7 +1314,7 @@ msgid "algorithm: %s"
 msgstr "算法：%s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "�支�的算法：%s"
@@ -1459,7 +1469,7 @@ msgstr "�能从 ‘%s’ 转�到 ‘%s’\n"
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open 方法失败： %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "从 ‘%s’ 转�到 ‘%s’ 时失败：%s\n"
@@ -1498,7 +1508,7 @@ msgstr "� ‘%s’ 未被建立： %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "等待� %s...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太旧 （需� %s，拥有 %s）\n"
@@ -1663,7 +1673,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr ""
@@ -1703,7 +1713,7 @@ msgstr "已清除�自�务器的��接�的 HTTP �定�"
 msgid "server uses an invalid certificate"
 msgstr "�务器�书无效"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, c-format
 msgid "Note: %s\n"
 msgstr "注�：%s\n"
@@ -1730,7 +1740,7 @@ msgstr "在批处�模�中无法完�此�作\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "这一命令�在版本 2 的�上�用\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "�置���用或���用\n"
@@ -1795,14 +1805,14 @@ msgstr "拉�公钥的 URL： "
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "读� ‘%s’ 时出现错误：%s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
@@ -2130,26 +2140,26 @@ msgstr "管�员命令��用\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的命令  （�试“help�）\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中�起作用\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "无法打开 ‘%s’\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "未找到密钥 ‘%s’：%s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2208,8 +2218,8 @@ msgid "subkey"
 msgstr "�密钥"
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失败：%s\n"
@@ -2269,14 +2279,14 @@ msgstr "密文算法 ‘%s’ �能�能被用于加密\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr "（使用选项 “%s� �覆盖）\n"
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "密文算法 ‘%s’ �能�能被用于 %s 模�\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2297,7 +2307,7 @@ msgstr "警告： 强制对称密文 %s (%d) 与接收者的�好设置冲�\n
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "警告： 密钥 %s 在 %s 模�下�适用于加密\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2396,12 +2406,12 @@ msgstr "��许导出�钥\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "密钥 %s：PGP 2.x 样�的密钥 - 已跳过\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "警告：没有导出任何东西\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, c-format
 msgid "error creating '%s': %s\n"
@@ -2465,268 +2475,268 @@ msgstr "无效的密钥 %s 通过 --allow-non-selfsigned-uid 生效\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用�密钥 %s 而�主密钥 %s\n"
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "选项 ‘%s’ 的有效值:\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 msgid "make a signature"
 msgstr "生�一份签�"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "make a clear text signature"
 msgstr "生�一份明文签�"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "生�一份分离的签�"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "加密数�"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称密文加密"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "解密数�（默认）"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "验�签�"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "列出密钥"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "列出密钥和签�"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签�"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "列出�钥"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "生�一个新的密钥对"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 msgid "quickly generate a new key pair"
 msgstr "快速生�一个新的密钥对"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "quickly add a new user-id"
 msgstr "快速添加一个新的用户标识"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 msgid "quickly revoke a user-id"
 msgstr "快速�销一个用户标识"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 msgid "quickly set a new expiration date"
 msgstr "快速设置一个过期日期"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr "完整功能的密钥对生�"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "生�一份�销�书"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "从�钥钥匙环里删除密钥"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "quickly sign a key"
 msgstr "快速签�一个密钥"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "quickly sign a key locally"
 msgstr "快速本地签�一个密钥"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 msgid "quickly revoke a key signature"
 msgstr "快速�销一个密钥签�"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "签�一个密钥"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "本地签�一个密钥"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "签�或编辑一个密钥"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "更改密�"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "将密钥导出到一个公钥�务器上"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "从公钥�务器上导入密钥"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "在公钥�务器上�索密钥"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "从公钥�务器更新所有密钥"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "导入/�并密钥"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr "打��片状�"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr "更改�片上的数�"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr "更改�片的 PIN"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "更新信任数�库"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid "print message digests"
 msgstr "打�消�摘�"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "以�务器模��行"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|设置一个密钥的 TOFU 政策"
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|使用 NAME 作为默认的�钥"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|�时给以 NAME 为�称的用户标识加密"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|设置电�邮件别�"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr "使用严格的 OpenPGP 行为"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "��任何更改"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "覆盖��示"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 msgid "Options controlling the input"
 msgstr "控制输入的选项"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 msgid "Options controlling the output"
 msgstr "控制输出的选项"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "创建 ASCII 字符�装的输出"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|写输出到 FILE"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "使用规范的文本模�"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|设置压缩等级为 N （0 为�用）"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 msgid "Options controlling key import and export"
 msgstr "控制密钥导入导出的选项"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|通过邮件地�定�密钥时使用机制 MECHANISMS"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 msgid "import missing key from a signature"
 msgstr "从签�中导入缺少的密钥"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 msgid "include the public key in signatures"
 msgstr "在签�中包�公钥"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "�用对 dirmngr 的所有访问"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 msgid "Options controlling key listings"
 msgstr "控制密钥列表的选项"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 msgid "Options to specify keys"
 msgstr "指定密钥的选项"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|为 USER-ID 加密"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|使用 USER-ID �签�或者解密"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr "用于无人值守的选项"
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr "其他选项"
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2734,7 +2744,7 @@ msgstr ""
 "@\n"
 "（请�考手册页以获得所有命令和选项的完整列表）\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2754,11 +2764,11 @@ msgstr ""
 " --list-keys [�字]        列出密钥\n"
 " --fingerprint [�字]      显示指纹\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "用法： @GPG@ [选项] [文件] (-h 获�帮助)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2768,7 +2778,7 @@ msgstr ""
 "签��检查�加密或解密\n"
 "默认的�作�输入数�而定\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2776,554 +2786,554 @@ msgstr ""
 "\n"
 "支�的算法：\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "公钥： "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "密文： "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "散列： "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "压缩：  "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "用法： %s [选项] %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "冲�的指令\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "群组定义 ‘%s’ 中找�到 = 标志\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的所有��安全\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "警告：�置文件‘%s’的所有��安全\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "警告：扩展模�‘%s’的所有��安全\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的����安全\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "警告：�置文件‘%s’的����安全\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "警告：扩展模�‘%s’的����安全\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的上级目录所有��安全\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "警告：�置文件‘%s’的上级目录所有��安全\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "警告：扩展模�‘%s’的上级目录所有��安全\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的上级目录����安全\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "警告：�置文件‘%s’的上级目录���安全\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "警告：扩展模�‘%s’的上级目录����安全\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "未知的�置项‘%s’\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示照片标识"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 msgid "show key usage information during key listings"
 msgstr "列出密钥时显示用途信�"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr "列出签�时显示策略 URL"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 msgid "show all notations during signature listings"
 msgstr "列出签�时显示所有注记"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签�时显示 IETF 标准注记"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签�时显示用户�供的注记"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出签�时显示首选公钥�务器 URL"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已�销或已过期的用户标识"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已�销或已过期的�密钥"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的�称"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 msgid "show expiration dates during signature listings"
 msgstr "列出签�时显示过期日期"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "未知的 TOFU 政策‘%s’\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "（使用“help��列出选择）\n"
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "��许在 %s 模�中使用此命令。\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "注�：%s �适用于一般使用�\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’�是一个有效的签�过期日期\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s� �是一个�适的邮件地�\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "无效的 pinentry 模�‘%s’\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 sm/gpgsm.c:1163
 #, c-format
 msgid "invalid request origin '%s'\n"
 msgstr "无效的请求��‘%s’\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3315
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’�是一个有效的字符集\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "无法解�公钥�务器 URL\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥�务器选项\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥�务器选项\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "无效的过滤选项：%s\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr "验�签�时显示照片标识"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr "验�签�时显示策略 URL"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 msgid "show all notations during signature verification"
 msgstr "验�签�时显示所有注记"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr "验�签�时显示 IETF 标准注记"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr "验�签�时显示用户�供的注记"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验�签�时显示首选公钥�务器 URL"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 msgid "show user ID validity during signature verification"
 msgstr "验�签�时显示用户标识的有效性"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验�密钥时显示已�销或已过期的�钥"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 msgid "show only the primary user ID in signature verification"
 msgstr "在签�验�中�显示主�用户标识"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 无效的验�选项\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr "无效的验�选项\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法设置�行路径为 %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s%d: 无效的 auto-key-locate 列表\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 列表\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "选项 “%.50s� 的�数无效\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程��能会创建核心内存转储文件�\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 覆盖了 %s \n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ��许与 %s 并用\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用时�起作用\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "警告：正在以虚�的系统时间�行： "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "�会在内存�安全的情况下�行，原因是 %s\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的密文算法无效\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, c-format
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "所选择的 AEAD 算法无效\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的�书散列算法无效\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "需�的完全�信签�数一定�大于 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需�的勉强�信签�数一定�大于 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大�书链深度（max-cert-depth）一定�介于 1 和 255 之间\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认认�级别（default-cert-level）；必须为 0，1，2 或 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最�认�级别（default-cert-level）；必须为 1，2 或 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注�：强烈�建议使用简�的 S2K 模� (0)\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模�；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "无效的默认�好设置\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人密文�好设置\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, c-format
 msgid "invalid personal AEAD preferences\n"
 msgstr "无效的个人 AEAD �好设置\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人摘�算法�好设置\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, c-format
 msgid "chunk size invalid - using %d\n"
 msgstr "�大�无效 - 使用 %d\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚�能和 %s 并用\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, c-format
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "AEAD 算法‘%s’�能在 %s 模�下使用\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "压缩算法‘%s’�能在 %s 模�下使用\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�始化信任度数�库失败：%s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了接收者（-r）但并未使用公钥加密\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "您�能在使用 --symmetric --encrypt 时使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "您�能在 %s 模�下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "您�能在使用 --symmetric --sign --encrypt 时使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "您�能在 %s 模�下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "��至公钥�务器失败：%s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥�务器接收失败：%s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "作为 ssh 密钥导出失败：%s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "公钥�务器�索失败：%s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "公钥�务器刷新失败：%s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开字符�装时失败：%s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行字符�装时失败：%s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "无效的散列算法‘%s’\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "解�密钥指定‘%s’时出现错误：%s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "‘%s’��是一个有效的密钥标识�指纹或者 keygrip\n"
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "警告：没有�供命令。正在�试猜测您的�图...\n"
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始输入您的消�…\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的�书策略 URL 无效\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签�策略 URL 无效\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥�务器 URL 无效\n"
@@ -3336,7 +3346,7 @@ msgstr "|FILE|从钥匙环 FILE 文件中�得密钥"
 msgid "make timestamp conflicts only a warning"
 msgstr "把时间戳冲�仅视为警告"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状�信�写入文件�述符 FD"
 
@@ -4036,7 +4046,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "您�然想�为它签��？(y/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  无法添加签�。\n"
 
@@ -4204,8 +4214,8 @@ msgstr "我�常�心地检查过这个密钥。\n"
 msgid "Really sign? (y/N) "
 msgstr "真的�签��？(y/N) "
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签�时失败： %s\n"
@@ -4398,7 +4408,7 @@ msgstr ""
 "  信任签�，‘nr’�缀（nrsign）进行���销签�，\n"
 "  或者上述三��缀的任�组�（ltsign�tnrsign 等）。\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "密钥已被�销。"
 
@@ -4446,7 +4456,7 @@ msgstr "真的�移除此用户标识�？(y/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "真的�移动主密钥�？(y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr "您必须选择一个密钥。\n"
 
@@ -4520,177 +4530,177 @@ msgstr "��存�更�？(y/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "���存而退出�？(y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有�更所以�需�更新。\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, c-format
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "�能�销最�一个有效的用户标识。\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, c-format
 msgid "revoking the user ID failed: %s\n"
 msgstr "�销用户标识时出现错误：%s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, c-format
 msgid "setting the primary user ID failed: %s\n"
 msgstr "设置主�用户标识时出现错误：%s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" �是一个指纹\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "“%s� �是主�指纹\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, c-format
 msgid "Invalid user ID '%s': %s\n"
 msgstr "无效的用户标识‘%s’：%s\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "No matching user IDs."
 msgstr "没有匹�的用户标识。"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "Nothing to sign.\n"
 msgstr "没有�被签�的东西。\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "并�由您签�。\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, c-format
 msgid "revoking the key signature failed: %s\n"
 msgstr "�销密钥签�失败：%s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, c-format
 msgid "'%s' is not a valid expiration time\n"
 msgstr "‘%s’�是一个有效的过期时间\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, c-format
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "“%s� �是一个正确的指纹\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, c-format
 msgid "subkey \"%s\" not found\n"
 msgstr "�密钥 “%s� 未找到\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr "AEAD： "
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "摘�： "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "特点： "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr "公钥�务器��修改"
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr "首选公钥�务器： "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 msgid "Notations: "
 msgstr "注记： "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "没有关于 PGP 2.x 样�用户标识的�好设置。\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "下列密钥在 %s 被 %s 的密钥 %s 所�销\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这个密钥�被 %s 的密钥 %s �销"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr "（�感的）"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr "�销于：%s"
 
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr "过期于：%s"
 
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr "�用于：%s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr "��： "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "这个密钥已�被�用"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注�，在您��程�之�，所显示的密钥有效性�一定正确。\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr "已�销"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4699,17 +4709,17 @@ msgstr ""
 "警告： 没有用户标识被标记为主�。 此命令�能会\n"
 "              导致一个��的用户标识被�定为主�。\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "警告： 您的加密用�密钥将在�久�过期。\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "您�能也想��更它的过期日期。\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4718,70 +4728,72 @@ msgstr ""
 "警告：这是一个 PGP2 样�的密钥。增加照片标识�能会导致�些版本的\n"
 "     PGP 拒�这个密钥。\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定�然想�增加�？(y/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您��以把照片标识增加到 PGP2 样�的密钥里。\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "这样的用户标识已�存在于这个密钥上了�\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签��？(y/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签��？(y/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签��？(y/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的�删除这个自签��？(y/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, c-format
 msgid "Deleted %d signature.\n"
 msgid_plural "Deleted %d signatures.\n"
 msgstr[0] "已�删除了 %d 个签�。\n"
 
-#: g10/keyedit.c:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "无效"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "用户标识 “%s� 已被压缩：%s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "用户标识 “%s�：已被最�化\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "用户标识 “%s�：无用部分已清�\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4790,209 +4802,209 @@ msgstr ""
 "警告：这是一个 PGP2 样�的密钥。增加指定�销者\n"
 "     �能会导致�些版本的 PGP 无法识别这个密钥。\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您��以为 PGP 2.x 样�的密钥添加指定�销者。\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定�销者的用户标识： "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "无法将 PGP 2.x 样�的密钥设为指定�销者\n"
 
-#: g10/keyedit.c:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "您�能将�把密钥设为它自己的指定�销者\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "这个密钥已被指派为一个�销者\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将�把密钥设置为指定�销者的�作无法撤销�\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定�将这个密钥设置为指定�销者�？(y/N)： "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 msgid ""
 "Are you sure you want to change the expiration time for multiple subkeys? (y/"
 "N) "
 msgstr "您确定�改�多个�密钥的过期时间�？ (y/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将��更�密钥的过期时间。\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将��更主密钥的过期时间。\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您�能�更 v3 密钥的过期时间\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 msgid "Changing usage of a subkey.\n"
 msgstr "�更一个�密钥的用途。\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 msgid "Changing usage of the primary key.\n"
 msgstr "�更主密钥的用途。\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "签�的�密钥 %s 已�交�验�\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "�密钥 %s �签�，因此�需�被交�验�\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "请选定仅一个用户标识。\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识 “%s� 上的 v3 自签�\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选公钥�务器的 URL： "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定�替�它�？(y/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定�删除它�？(y/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 msgid "Enter the notation: "
 msgstr "输入注记： "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 msgid "Proceed? (y/N) "
 msgstr "继续？(y/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有散列值为 %s 的用户标识\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, c-format
 msgid "No subkey with key ID '%s'.\n"
 msgstr "没有属于密钥标识‘%s’的�密钥。\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的�密钥\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s�\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签�\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (��导出)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "此签�已在 %s 过期。\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您�然想��销它�？(y/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�为这份签�生�一份�销�书�？(y/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已�签��密钥 %s 上的这些用户标识：\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr " (���销)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s �销于 %s\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在�销这些签�：\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的�生��销�书�？(y/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "没有�钥\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr "�试�销一个�用户标识：%s\n"
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识 “%s� 已�被�销。\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签�的日期标记为 %d 秒�的未�\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, c-format
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "�能�销最�一个有效的用户标识。\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被�销。\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�密钥 %s 已被�销。\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 的照片标识，大� %ld，属于密钥 %s （用户标识 %d）\n"
@@ -5402,6 +5414,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请��把电�邮件地�放进您的真实姓�或注释里\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr "这样的用户标识已�存在于这个密钥上了�\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5708,53 +5724,53 @@ msgstr "无效的公钥�务器�议（us %d!=handler %d）\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s� �是一个用户标识：跳过\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, c-format
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "正在更新 %d 把密钥，从 %s \n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告：无法通过 %s 更新密钥 %s ：%s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在公钥�务器上找�到密钥 “%s�\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "在公钥�务器上找�到密钥\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "正在请求密钥 %s 从 %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, c-format
 msgid "no keyserver known\n"
 msgstr "无已知的公钥�务器\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "已跳过 “%s�： %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "正在��密钥 %s 到 %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "正在从 %s 请求密钥\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告：无法获� URI %s：%s\n"
@@ -5784,67 +5800,67 @@ msgstr "未知的算法加密 %d.%s\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密�由未知的散列算法 %d 生�\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr "公钥是 %s\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, c-format
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "由 %s 密钥加密，标识为 %s，生�于 %s\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s�\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "由 %s 密钥加密�密钥�为 %s\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "警告： 检测到多�纯文本\n"
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "以 %lu 个密�加密\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密�加密\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公钥解密失败：%s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "公钥加密数�：完好的数�加密密钥（DEK）\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "�定 %s 为加密过的数�\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 密文算法��用，�试使用 %s 代替\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告：消�未�到完整性�护\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
@@ -5854,178 +5870,178 @@ msgstr ""
 "看起�此信�就是�法的。这是因为那个时候完整性\n"
 "�护还没有被广泛地采用。\n"
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr "无论如何使用选项‘%s’�解密。\n"
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, c-format
 msgid "decryption forced to fail!\n"
 msgstr "解密强制失败�\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "解密�功\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告：加密过的报文已��造�\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失败：%s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "注�：��者�求您“�阅读�存盘�\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始文件� =‘%.*s’\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的�销�书 - 请使用“gpg --import��应用\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, c-format
 msgid "no signature found\n"
 msgstr "未找到签�\n"
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已��的签�，�自于 “%s�"
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签�，�自于 “%s�"
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签�，�自于 “%s�"
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "签�验�已被抑制\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "无法处�此有歧义的签�数�\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr "签�建立于 %s\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "              使用 %s 密钥 %s\n"
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "于 %s 创建的签�，使用 %s，密钥� %s\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               签�者 \"%s\"\n"
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "密钥在以下地方�用： "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr "注�：使用 “%s� �使用此信�\n"
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[�确定]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦� “%s�"
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "警告： 此密钥在 %s 模�下�适用于签�\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签�已于 %s 过期。\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签�在 %s 过期。\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s 签�，摘�算法 %s%s%s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "文本模�"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 msgid ", key algorithm "
 msgstr "，密钥算法 "
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "警告：�是一个分离签�；文件‘%s’没有被验��\n"
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签�：%s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "�是一份分离的签�\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多�签�。�检查第一个签�。\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签�\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧�（PGP 2.x）签�\n"
@@ -6095,11 +6111,6 @@ msgstr "（更多信�： "
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d：被弃用的选项 “%s�\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "警告：“%s� 是一个已被弃用的选项\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7119,133 +7130,133 @@ msgstr "读�‘%s’时出现错误：%s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任度数�库：sync 失败：%s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "无法为‘%s’创建�\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "无法�定‘%s’\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任度数�库记录 %lu：lseek 失败：%s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任度数�库记录 %lu：write 失败 (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "信任度数�库处��过大\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s：目录�存在�\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "无法访问‘%s’：%s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s：建立版本记录失败：%s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s：建立了无效的信任度数�库\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s：建立了信任度数�库\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "注�：信任度数�库��写入\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s：无效的信任度数�库\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s：建立散列表失败：%s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s：更新版本记录时出现错误： %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s：读�版本记录时出现错误： %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s：写入版本记录时出现错误：%s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信任度数�库：lseek 失败：%s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信任度数�库：read 失败(n=%d)：%s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s：�是一个信任度数�库文件\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s：记录编�为%lu的版本记录\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s：无效的文件版本%d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s：读�自由记录时出现错误：%s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s：写入目录记录时出现错误：%s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s：记录归零时失败：%s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s：附加记录时失败：%s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "错误：信任度数�库已被破�。\n"
@@ -7829,16 +7840,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%s数字: %s%%0A�有者: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "剩余�试：%d"
@@ -7867,10 +7878,10 @@ msgstr "|N|请输入新的解�密钥"
 msgid "||Please enter the Unblocking Key of your PIV card"
 msgstr "||请为您的 PIV �片输入解�密钥"
 
-#: scd/app-piv.c:1888 scd/app-nks.c:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
@@ -7890,149 +7901,149 @@ msgstr "PIN 过长，最大长度为 %d\n"
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr "PIN 有无效字符；��许使用数字\n"
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr "密钥已存在\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "现有的密钥将被替�\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr "生�新密钥\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, c-format
 msgid "writing new key\n"
 msgstr "正在写入新密钥\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "存储密钥失败：%s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "�应�包� RSA 余数\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "�应�包� RSA 公钥指数\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "�应�包� EC 公钥\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "请等待密钥生�…\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr "生�密钥失败\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "密钥生�完�（%d 秒）\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "�应�包�公钥数�\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||请为这个密钥输入 PIN 以创建�格的签�。"
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|请输入管�员 PIN"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|请输入标准密钥的 PIN 解��（PUK）。"
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||请输入标准密钥的 PIN。"
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 余数缺失或者�是 %d �长\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公钥指数缺失或长于 %d �\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 msgid "Note: PIN has not yet been enabled."
 msgstr "注�：尚未�用 PIN。"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "尚未�更 NullPIN\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|请为标准密钥输入一个新的 PIN。"
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|请为标准密钥输入一个新的 PIN 解��（PUK）。"
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|请为这个密钥输入一个新的 PIN 以创建�格的签�。"
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr "|NP|请为这个密钥输入一个新的 PIN 解��（PUK）以创建�格的签�。"
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr "|P|请为这个密钥输入 PIN 解��（PUK）以创建�格的签�。"
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "获�新 PIN 时出现错误：%s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "存储指纹失败：%s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "存储创建日期失败：%s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "从�片中拉� CHV 状�时出现错误\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "读�公钥失败：%s\n"
@@ -8040,62 +8051,62 @@ msgstr "读�公钥失败：%s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%s数字: %s%%0A�有者: %s%%0A计数: %lu%s"
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "使用默认 PIN 作为 %s\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr "使用默认 PIN 作为 %s 失败：%s - �用进一步的默认使用\n"
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 msgid "||Please unlock the card"
 msgstr "||请解��片"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d 的 PIN 太短；最�长度为 %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验� CHV%d 失败：%s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "�片被永久�定�\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
 "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr[0] "在�片被永久�定之�剩余 %d 次管�员 PIN �试\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "未�置到管�员命令的访问\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 msgid "||Please enter the PIN"
 msgstr "||请输入 PIN"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 msgid "||Please enter the Reset Code for the card"
 msgstr "||请输入�片的�置�"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "�置�太短；最�长度为 %d\n"
@@ -8103,78 +8114,78 @@ msgstr "�置�太短；最�长度为 %d\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr "|RN|新的�置�"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新的管�员 PIN"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr "|N|æ–°çš„ PIN"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||请输入原管�员 PIN 和新管�员 PIN"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 msgid "||Please enter the PIN and New PIN"
 msgstr "||请输入原 PIN 和新 PIN"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr "读�应用程�数�时出错\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "读�指纹 DO 时出现错误\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "缺少创建时间戳\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 质数 %s 缺失或者�是 %d �长\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, c-format
 msgid "unsupported curve\n"
 msgstr "�支�的曲线\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP �结构（DO 0x93）\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "�片上的指纹与请求的�匹�\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "�片�支�摘�算法 %s\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目�已创建的签�：%lu\n"
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目��止通过此命令验�管�员 PIN\n"
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�能访问 %s - 无效的 OpenPGP �？\n"
@@ -8194,7 +8205,7 @@ msgstr "|N|�始化新 PIN"
 msgid "run in multi server mode (foreground)"
 msgstr "正在以多�务器模��行（��）"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|设置调试级别至 LEVEL"
 
@@ -8238,11 +8249,11 @@ msgstr "|LIST|将应用程�优先级改为 LIST"
 msgid "deny the use of admin card commands"
 msgstr "拒�使用�片的管�员命令"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "用法：@SCDAEMON@ [选项] (-h 获�帮助)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8250,22 +8261,22 @@ msgstr ""
 "语法：scdaemon [选项] [命令 [�数]]\n"
 "@GNUPG@ 智能�守护进程\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "请使用‘--daemon’选项以在���行此程�\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d 的�柄已�动\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d 的�柄已关闭\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -8491,7 +8502,7 @@ msgstr "根�书未被标记为信任"
 msgid "checking the trust list failed: %s\n"
 msgstr "检查信任列表时失败：%s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "�书链过长\n"
@@ -8546,7 +8557,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "一个 %u �的散列对于一个 %u �的 %s 密钥是无效的\n"
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
@@ -8591,42 +8602,42 @@ msgstr ""
 "S/N %s，ID 0x%08lX，\n"
 "创建于 %s，过期于 %s。\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "没有指定密钥用途 - �设为所有用途\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "�书本�应被用于认�\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "�书本�应被用于认 OCSP �应签�\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "�书本�应被用于加密\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "�书本�应被用于签�\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "�书��用于加密\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "�书��用于签�\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, c-format
 msgid "looking for another certificate\n"
 msgstr "查找�一个�书\n"
@@ -8812,6 +8823,11 @@ msgstr "创建自签��书？ (y/N) "
 msgid "These parameters are used:\n"
 msgstr "这些�数被使用：\n"
 
+#: sm/certreqgen-ui.c:433
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "创建临时文件时出现错误： %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr "现在正在创建自签��书。  "
@@ -8882,123 +8898,123 @@ msgstr "删除�书 “%s� 时失败：%s\n"
 msgid "no valid recipients given\n"
 msgstr "未指定有效的接收者\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "list external keys"
 msgstr "列出外部密钥"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "list certificate chain"
 msgstr "列出�书链"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 msgid "import certificates"
 msgstr "导入�书"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "export certificates"
 msgstr "导出�书"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr "注册一张智能�"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr "传递一�命令给 dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr "调用 gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "始终�使用终端"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr "|N|�包�的�书数目"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|从 FILE 处获�策略信�"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr "�定输入的是 PEM 格�"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr "�定输入的是 base-64 格�"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr "�定输入的是二进制格�"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 msgid "create base-64 encoded output"
 msgstr "创建 base-64 编�的输出"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|使用 USER-ID 作为默认的�钥"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|添加钥匙环到钥匙环列表"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr "获�缺失的签�者�书"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|对 PKCS#12 密�使用�为 NAME 的编�"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr "从�查询 CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr "�对根�书检查 CRLs"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr "使用 OCSP 检查有效性"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr "�检查�书策略"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|使用�称为 NAME 的密文算法"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|使用以 NAME 命�的信�摘�算法"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "批处�模�：永�询问"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "在多数问题上�定回答为是"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "在多数问题上�定回答为�"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|将审计日志写入 FILE"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "用法：@GPGSM@ [选项] [文件] (-h 获�帮助)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9008,27 +9024,27 @@ msgstr ""
 "使用 S/MIME �议以签��检查�加密或者解密\n"
 "默认�作�决于输入的数�\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "注�：将�加密给‘%s’：%s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "未知的验�模型‘%s’\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "正在导入通用�书‘%s’\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "无法使用‘%s’签�：%s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "无效的命令（�存在��的命令）\n"
@@ -9058,7 +9074,7 @@ msgstr "获�存储选项时出现错误：%s\n"
 msgid "error importing certificate: %s\n"
 msgstr "导入�书时出现错误：%s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "读�输入时出现错误：%s\n"
@@ -9098,7 +9114,7 @@ msgstr "�新�索�书时出现问题：%s\n"
 msgid "error storing flags: %s\n"
 msgstr "存储选项时出现错误：%s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "错误 - "
 
@@ -9473,11 +9489,6 @@ msgstr "创建临时缓存目录文件‘%s’时失败：%s\n"
 msgid "error closing '%s': %s\n"
 msgstr "关闭‘%s’时出现错误：%s\n"
 
-#: dirmngr/crlcache.c:948
-#, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "将‘%s’�命�为‘%s’时出现错误：%s\n"
-
 #: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
@@ -10144,92 +10155,92 @@ msgstr "有效的调试等级为：%s\n"
 msgid "usage: %s [options] "
 msgstr "用法：%s [选项] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "套接字�称中��许使用冒�\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "从‘%s’处获� CRL 时失败：%s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "从‘%s’处处� CRL 时失败：%s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: 行太长 - 跳过\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: 检测到无效指纹\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: 读�错误：%s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: 已忽略行尾部的垃圾数�\n"
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "接收到 SIGHUP 信� -正在�新读��置文件并刷新缓存\n"
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "接收到 SIGUSR2 信� - 未定义�进行的�作\n"
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "接收到 SIGTERM 信� - 正在关闭...\n"
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "接收到 SIGTERM 信� - �然有 %d 个活动的连接\n"
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, c-format
 msgid "shutdown forced\n"
 msgstr "强制关闭\n"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "收到 SIGINT 信� - 立�关闭\n"
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "收到 %d 信� - 未定义�进行的�作\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "访问‘%s’时出现错误：http 状�� %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL '%s' �定�到 '%s' (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "过多�定�\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, c-format
 msgid "redirection changed to '%s'\n"
 msgstr "�定�更改到 “%s�\n"
@@ -10592,55 +10603,55 @@ msgstr "�书链良好\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "�书本�应被用于 CRL 签�\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "�默"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr "以�六进制编�打�数�"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr "解�接收到的数�行"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr "连接到 dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 msgid "connect to the keyboxd"
 msgstr "连接 keyboxd"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|NAME|连接到�称为 NAME 的 Assuan 套接字"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|连接到地�为 ADDR 的 Assuan �务器"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr "�行命令行中指定的 Assuan �务器"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr "�使用扩展连接模�"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|FILE|在�动时从 FILE 处执行命令"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr "在�动时�行 /subst"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "用法：@GPG@-connect-agent [选项] (-h 获�帮助)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -10648,48 +10659,48 @@ msgstr ""
 "语法：@GPG@-connect-agent [选项]\n"
 "连接到一个正在�行的代�人程�并��命令\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "选项 “%s� �求一个程�和�选�数\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "已忽略选项 “%s�，因为 “%s�\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "接收行失败：%s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "行太长 - 跳过\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "行已被截断，因为内嵌有 Nul 字符\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "未知命令‘%s’\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "��行失败：%s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, c-format
 msgid "no keybox daemon running in this session\n"
 msgstr "此会�中没有正在�行的 keybox 守护进程\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "��标准选项时出现错误：%s\n"
@@ -10749,12 +10760,12 @@ msgstr "组件 %s 的外部验�失败"
 msgid "Note that group specifications are ignored\n"
 msgstr "注�，群组规范已被忽略\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "关闭‘%s’时出现错误\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "处�‘%s’时出现错误\n"
@@ -10935,6 +10946,12 @@ msgstr "Yubikey 管�命令"
 msgid "manage the command history"
 msgstr "管�命令历�记录"
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "写入临时文件时出现错误： %s\n"
+
+#~ msgid "run in supervised mode"
+#~ msgstr "以管�进程模��行"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "姓���以用数字开头\n"
 
@@ -11262,9 +11279,6 @@ msgstr "管�命令历�记录"
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "�能为写入打开 %s ：%s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "写入 %s 时出现错误：%s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "关闭 %s 时出现错误：%s\n"
 
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index d9b86bf..3cd07bd 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ebbabb7..9349992 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-04-21 16:55+0200\n"
+"POT-Creation-Date: 2022-07-11 12:31+0200\n"
 "PO-Revision-Date: 2019-11-04 09:49+0100\n"
 "Last-Translator: Jedi Lin <Jedi@Jedi.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.5.7\n"
 
-#: agent/call-pinentry.c:338
+#: agent/call-pinentry.c:340
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "個人識別碼項目鎖定��失敗: %s\n"
@@ -32,59 +32,59 @@ msgstr "個人識別碼項目鎖定��失敗: %s\n"
 #. * text.  An underscore indicates that the next letter should be
 #. * used as an accelerator.  Double the underscore to have
 #. * pinentry display a literal underscore.
-#: agent/call-pinentry.c:556
+#: agent/call-pinentry.c:554
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:557
+#: agent/call-pinentry.c:555
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|�消 (_C)"
 
-#: agent/call-pinentry.c:558
+#: agent/call-pinentry.c:556
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:559
+#: agent/call-pinentry.c:557
 #, fuzzy
 #| msgid "|pinentry-label|_OK"
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|_OK"
 
-#: agent/call-pinentry.c:560
+#: agent/call-pinentry.c:558
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|個人識別碼 (PIN):"
 
-#: agent/call-pinentry.c:561
+#: agent/call-pinentry.c:559
 #, fuzzy
 #| msgid "|pinentry-label|_Cancel"
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|�消 (_C)"
 
-#: agent/call-pinentry.c:562
+#: agent/call-pinentry.c:560
 #, fuzzy
 #| msgid "Do you really want to permanently delete the OpenPGP secret key:"
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "你是�真的想�永久刪除 OpenPGP �鑰:"
 
-#: agent/call-pinentry.c:564
+#: agent/call-pinentry.c:562
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr ""
 
-#: agent/call-pinentry.c:565
+#: agent/call-pinentry.c:563
 #, fuzzy
 #| msgid "Enter new passphrase"
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "請輸入新密語"
 
-#: agent/call-pinentry.c:566
+#: agent/call-pinentry.c:564
 msgid "Caps Lock is on"
 msgstr ""
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for generating a passphrase.
-#: agent/call-pinentry.c:1022
+#: agent/call-pinentry.c:1019
 msgid "Suggest"
 msgstr ""
 
@@ -95,7 +95,7 @@ msgstr ""
 #. translate this entry, a default English text (see source)
 #. will be used.  The strcmp thingy is there to detect a
 #. non-translated string.
-#: agent/call-pinentry.c:1044
+#: agent/call-pinentry.c:1041
 #, fuzzy
 #| msgid "pinentry.qualitybar.tooltip"
 msgid "pinentry.genpin.tooltip"
@@ -106,14 +106,14 @@ msgstr ""
 #. TRANSLATORS: This is a text shown by pinentry if the option
 #. for formatted passphrase is enabled.  The length is
 #. limited to about 900 characters.
-#: agent/call-pinentry.c:1072
+#: agent/call-pinentry.c:1069
 msgid "Note: The blanks are not part of the passphrase."
 msgstr ""
 
 #. TRANSLATORS: This is a text shown by pinentry as title of a dialog
 #. telling the user that the entered new passphrase does not satisfy
 #. the passphrase constraints.  Please keep it short.
-#: agent/call-pinentry.c:1131
+#: agent/call-pinentry.c:1128
 #, fuzzy
 #| msgid "Passphrase too long"
 msgid "Passphrase Not Allowed"
@@ -121,7 +121,7 @@ msgstr "密語太長"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:1198
+#: agent/call-pinentry.c:1195
 msgid "Quality:"
 msgstr "優劣程度: %s"
 
@@ -131,94 +131,94 @@ msgstr "優劣程度: %s"
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:1219
+#: agent/call-pinentry.c:1216
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "上列輸入文字的優劣程度.\n"
 "關於此�範的細節, 請洽你的系統管�者."
 
-#: agent/call-pinentry.c:1477
+#: agent/call-pinentry.c:1474
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "請輸入你的個人識別碼 (PIN) 以便在此階段作業中解開�鑰"
 
-#: agent/call-pinentry.c:1480
+#: agent/call-pinentry.c:1477
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "請輸入你的密語以便在此階段作業中解開�鑰"
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 msgid "PIN:"
 msgstr ""
 
-#: agent/call-pinentry.c:1517 agent/call-pinentry.c:1724
+#: agent/call-pinentry.c:1514 agent/call-pinentry.c:1721
 #: agent/protect-tool.c:729
 msgid "Passphrase:"
 msgstr "密語:"
 
-#: agent/call-pinentry.c:1544 agent/call-pinentry.c:1802 agent/command.c:1929
-#: agent/command.c:1988 agent/command-ssh.c:3056 agent/genkey.c:442
+#: agent/call-pinentry.c:1541 agent/call-pinentry.c:1799 agent/command.c:2049
+#: agent/command.c:2108 agent/command-ssh.c:3145 agent/genkey.c:427
 msgid "does not match - try again"
 msgstr "�後�一致 - 請�試一次"
 
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1566 agent/call-pinentry.c:1830
+#: agent/call-pinentry.c:1563 agent/call-pinentry.c:1827
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (第 %d 次嘗試, 最多 %d 次)"
 
-#: agent/call-pinentry.c:1577 agent/call-pinentry.c:1841
+#: agent/call-pinentry.c:1574 agent/call-pinentry.c:1838
 msgid "Repeat:"
 msgstr "�複:"
 
-#: agent/call-pinentry.c:1589 agent/call-pinentry.c:1601
-#: agent/call-pinentry.c:1853 agent/call-pinentry.c:1865
+#: agent/call-pinentry.c:1586 agent/call-pinentry.c:1598
+#: agent/call-pinentry.c:1850 agent/call-pinentry.c:1862
 msgid "PIN too long"
 msgstr "個人識別碼 (PIN) 太長"
 
-#: agent/call-pinentry.c:1590 agent/call-pinentry.c:1854
+#: agent/call-pinentry.c:1587 agent/call-pinentry.c:1851
 msgid "Passphrase too long"
 msgstr "密語太長"
 
-#: agent/call-pinentry.c:1598 agent/call-pinentry.c:1862
+#: agent/call-pinentry.c:1595 agent/call-pinentry.c:1859
 msgid "Invalid characters in PIN"
 msgstr "個人識別碼 (PIN) �有無效的字符"
 
-#: agent/call-pinentry.c:1603 agent/call-pinentry.c:1867
+#: agent/call-pinentry.c:1600 agent/call-pinentry.c:1864
 msgid "PIN too short"
 msgstr "個人識別碼 (PIN) 太短"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad PIN"
 msgstr "�良的個人識別碼 (PIN)"
 
-#: agent/call-pinentry.c:1622 agent/call-pinentry.c:1885
+#: agent/call-pinentry.c:1619 agent/call-pinentry.c:1882
 msgid "Bad Passphrase"
 msgstr "�良的密語"
 
-#: agent/command.c:823
+#: agent/command.c:826
 msgid "Note: Request from the web browser."
 msgstr ""
 
-#: agent/command.c:824
+#: agent/command.c:827
 msgid "Note: Request from a remote site."
 msgstr ""
 
-#: agent/command.c:1235 g10/card-util.c:741 g10/card-util.c:762
+#: agent/command.c:1329 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:1756 agent/command.c:1921 agent/command-ssh.c:2984
-#: agent/genkey.c:377
+#: agent/command.c:1876 agent/command.c:2041 agent/command-ssh.c:3073
+#: agent/genkey.c:362
 msgid "Please re-enter this passphrase"
 msgstr "請�次輸入密語"
 
-#: agent/command.c:2703
+#: agent/command.c:2830
 #, 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:2833
+#: agent/command.c:2960
 msgid ""
 "This key (or subkey) is not protected with a passphrase.  Please enter a new "
 "passphrase to export it."
@@ -240,24 +240,24 @@ msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "未支�大於 %d �元的 ssh 金鑰\n"
 
 #: agent/command-ssh.c:874 common/dotlock.c:856 g10/card-util.c:991
-#: g10/export.c:1329 g10/gpg.c:1454 g10/keygen.c:5370 g10/keyring.c:1329
+#: g10/export.c:1329 g10/gpg.c:1455 g10/keygen.c:5370 g10/keyring.c:1329
 #: g10/keyring.c:1642 g10/openfile.c:293 g10/photoid.c:531 g10/photoid.c:549
-#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:753 tools/gpg-card.c:479
+#: g10/sign.c:1113 g10/sign.c:1452 g10/tdbio.c:739 tools/gpg-card.c:479
 #, 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
 #: g10/dearmor.c:59 g10/dearmor.c:104 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1455
+#: g10/decrypt.c:148 g10/encrypt.c:308 g10/encrypt.c:715 g10/gpg.c:1456
 #: g10/import.c:379 g10/import.c:566 g10/import.c:801 g10/keygen.c:4319
 #: g10/keyring.c:1668 g10/openfile.c:197 g10/openfile.c:211 g10/plaintext.c:128
 #: g10/plaintext.c:640 g10/sign.c:1093 g10/sign.c:1320 g10/sign.c:1433
-#: g10/sign.c:1605 g10/tdbdump.c:145 g10/tdbdump.c:153 g10/tdbio.c:758
-#: g10/tdbio.c:829 g10/verify.c:96 g10/verify.c:160 sm/gpgsm.c:2253
-#: sm/gpgsm.c:2283 sm/gpgsm.c:2321 sm/keylist.c:1791 sm/qualified.c:65
+#: 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:2274
+#: sm/gpgsm.c:2304 sm/gpgsm.c:2342 sm/keylist.c:1809 sm/qualified.c:65
 #: dirmngr/certcache.c:405 dirmngr/certcache.c:487 dirmngr/certcache.c:489
-#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1817 tools/gpg-card.c:408
+#: dirmngr/crlcache.c:2639 dirmngr/dirmngr.c:1821 tools/gpg-card.c:408
 #, 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:2513
+#: agent/command-ssh.c:2467
 #, fuzzy, c-format
 #| msgid "error getting stored flags: %s\n"
 msgid "error getting list of cards: %s\n"
 msgstr "�得已存放的旗標時出錯: %s\n"
 
-#: agent/command-ssh.c:2688
+#: agent/command-ssh.c:2777
 #, 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:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Allow"
 msgstr "�許"
 
-#: agent/command-ssh.c:2695
+#: agent/command-ssh.c:2784 agent/findkey.c:1240
 msgid "Deny"
 msgstr "拒絕"
 
-#: agent/command-ssh.c:2704
+#: agent/command-ssh.c:2793
 #, c-format
 msgid "Please enter the passphrase for the ssh key%%0A  %F%%0A  (%c)"
 msgstr "請輸入此 ssh 金鑰的密語 %%0A  %F%%0A  (%c)"
 
-#: agent/command-ssh.c:3011
+#: agent/command-ssh.c:3100
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%0A   "
@@ -302,89 +302,81 @@ msgid ""
 msgstr ""
 "請輸入密語以�護收到的�鑰 %%0A   %s%%0A   %s%%0A 於 gpg-agent 的金鑰存放處"
 
-#: agent/command-ssh.c:3708
+#: agent/command-ssh.c:3797
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "從 socket 建立串�失敗: %s\n"
 
-#: agent/divert-scd.c:118
-msgid "Please insert the card with serial number"
-msgstr "請�入下列�號的�片:"
-
-#: agent/divert-scd.c:243
+#: agent/divert-scd.c:136
 msgid "Admin PIN"
 msgstr "管�者個人識別碼 (PIN)"
 
 #. TRANSLATORS: A PUK is the Personal Unblocking Code
 #. used to unblock a PIN.
-#: agent/divert-scd.c:248
+#: agent/divert-scd.c:141
 msgid "PUK"
 msgstr "PIN �設碼 (PUK)"
 
-#: agent/divert-scd.c:255
+#: agent/divert-scd.c:148
 msgid "Reset Code"
 msgstr "�設碼"
 
-#: agent/divert-scd.c:283
+#: agent/divert-scd.c:176
 msgid "Push ACK button on card/token."
 msgstr ""
 
-#: agent/divert-scd.c:305 agent/divert-scd.c:309
+#: agent/divert-scd.c:198 agent/divert-scd.c:202
 #, fuzzy
 #| msgid "%s%%0A%%0AUse the reader's pinpad for input."
 msgid "Use the reader's pinpad for input."
 msgstr "%s%%0A%%0A使用讀�機的�盤來輸入."
 
-#: agent/divert-scd.c:375
+#: agent/divert-scd.c:268
 msgid "Repeat this Reset Code"
 msgstr "請�次輸入�設碼"
 
-#: agent/divert-scd.c:377
+#: agent/divert-scd.c:270
 msgid "Repeat this PUK"
 msgstr "請�次輸入 PUK"
 
-#: agent/divert-scd.c:378
+#: agent/divert-scd.c:271
 msgid "Repeat this PIN"
 msgstr "請�次輸入個人識別碼 (PIN)"
 
-#: agent/divert-scd.c:383
+#: agent/divert-scd.c:276
 msgid "Reset Code not correctly repeated; try again"
 msgstr "�後兩次輸入的�設碼�一致; 請�試一次"
 
-#: agent/divert-scd.c:385
+#: agent/divert-scd.c:278
 msgid "PUK not correctly repeated; try again"
 msgstr "�後兩次輸入的 PUK �一致; 請�試一次"
 
-#: agent/divert-scd.c:386
+#: agent/divert-scd.c:279
 msgid "PIN not correctly repeated; try again"
 msgstr "�後兩次輸入的個人識別碼 (PIN) �一致; 請�試一次"
 
-#: agent/divert-scd.c:399
+#: agent/divert-scd.c:292
 #, c-format
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "請輸入個人識別碼 (PIN)%s%s%s 以解開�片"
 
-#: agent/genkey.c:142 sm/certreqgen-ui.c:433
-#, c-format
-msgid "error creating temporary file: %s\n"
-msgstr "建立暫存檔時出錯: %s\n"
-
-#: agent/genkey.c:150
-#, c-format
-msgid "error writing to temporary file: %s\n"
-msgstr "寫入暫存檔時出錯: %s\n"
+#: agent/genkey.c:154
+#, fuzzy, c-format
+#| msgid "error writing to %s: %s\n"
+msgid "error writing to pipe: %s\n"
+msgstr "寫入 %s 時出錯: %s\n"
 
-#: agent/genkey.c:191
+#: agent/genkey.c:176
 msgid "Enter new passphrase"
 msgstr "請輸入新密語"
 
-#: agent/genkey.c:227
+#: agent/genkey.c:212
 #, c-format
 msgid ""
 "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "你還沒有輸入密語!%0A空密語是�行的."
 
-#: agent/genkey.c:229
+#: agent/genkey.c:214
 #, c-format
 msgid ""
 "You have not entered a passphrase - this is in general a bad idea!%0APlease "
@@ -393,265 +385,259 @@ msgstr ""
 "你還沒有輸入密語 - 通常這��是個好主�!%0A請確�你�想��你的金鑰�任何�"
 "è­·."
 
-#: agent/genkey.c:241
+#: agent/genkey.c:226
 msgid "Yes, protection is not needed"
 msgstr "是, �需�任何�護"
 
-#: agent/genkey.c:258
+#: agent/genkey.c:243
 #, c-format
 msgid "A passphrase should be at least %u character long."
 msgid_plural "A passphrase should be at least %u characters long."
 msgstr[0] "密語至少�有 %u 個字符長."
 
-#: agent/genkey.c:277
+#: agent/genkey.c:262
 #, c-format
 msgid "A passphrase should contain at least %u digit or%%0Aspecial character."
 msgid_plural ""
 "A passphrase should contain at least %u digits or%%0Aspecial characters."
 msgstr[0] "密語至少得��有 %u 個數字或%%0A特別字符."
 
-#: agent/genkey.c:304
+#: agent/genkey.c:289
 #, fuzzy, c-format
 #| msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgid "A passphrase may not be a known term or match%%0Acertain pattern."
 msgstr "密語�得�有已知的詞彙, 亦�得與%%0A確知的模���."
 
-#: agent/genkey.c:319
+#: agent/genkey.c:304
 msgid "Warning: You have entered an insecure passphrase."
 msgstr "警告: 你輸入了�安全的密語."
 
-#: agent/genkey.c:340
+#: agent/genkey.c:325
 msgid "Take this one anyway"
 msgstr "無論如何還是�用這個"
 
-#: agent/genkey.c:508
+#: agent/genkey.c:493
 #, c-format
 msgid "Please enter the passphrase to%0Aprotect your new key"
 msgstr "請輸入密語至%0A以�護你的新金鑰"
 
-#: agent/genkey.c:637
+#: agent/genkey.c:622
 msgid "Please enter the new passphrase"
 msgstr "請輸入新的密語"
 
-#: agent/gpg-agent.c:165 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
+#: agent/gpg-agent.c:167 scd/scdaemon.c:115 dirmngr/dirmngr.c:185
 #, fuzzy
 #| msgid "Options useful for debugging"
 msgid "Options used for startup"
 msgstr "�除錯有幫助的�項"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
+#: agent/gpg-agent.c:169 scd/scdaemon.c:120 dirmngr/dirmngr.c:174
 msgid "run in daemon mode (background)"
 msgstr "以�務模�執行 (背景)"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
+#: agent/gpg-agent.c:170 scd/scdaemon.c:117 dirmngr/dirmngr.c:173
 msgid "run in server mode (foreground)"
 msgstr "以伺�器模�執行 (�景)"
 
-#: agent/gpg-agent.c:170 dirmngr/dirmngr.c:176
-#, fuzzy
-#| msgid "run in server mode"
-msgid "run in supervised mode"
-msgstr "以伺�器模�執行"
-
-#: agent/gpg-agent.c:172 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
+#: agent/gpg-agent.c:174 scd/scdaemon.c:121 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr "��從 console 分離"
 
-#: agent/gpg-agent.c:173 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
+#: agent/gpg-agent.c:175 scd/scdaemon.c:122 dirmngr/dirmngr.c:188
 msgid "sh-style command output"
 msgstr "sh 樣�的指令輸出"
 
-#: agent/gpg-agent.c:174 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
+#: agent/gpg-agent.c:176 scd/scdaemon.c:123 dirmngr/dirmngr.c:189
 msgid "csh-style command output"
 msgstr "csh 樣�的指令輸出"
 
-#: agent/gpg-agent.c:183 g10/gpg.c:595 scd/scdaemon.c:125 sm/gpgsm.c:428
+#: agent/gpg-agent.c:185 g10/gpg.c:596 scd/scdaemon.c:125 sm/gpgsm.c:429
 #: dirmngr/dirmngr.c:192
 msgid "|FILE|read options from FILE"
 msgstr "|檔案|從指定檔案中讀��項"
 
-#: agent/gpg-agent.c:187 g10/gpg.c:580 scd/scdaemon.c:129 sm/gpgsm.c:269
+#: agent/gpg-agent.c:189 g10/gpg.c:581 scd/scdaemon.c:129 sm/gpgsm.c:270
 #: dirmngr/dirmngr.c:196
 msgid "Options controlling the diagnostic output"
 msgstr "控制著診斷性輸出的�項"
 
-#: agent/gpg-agent.c:189 g10/gpg.c:582 g10/gpgv.c:78 kbx/kbxutil.c:89
-#: scd/scdaemon.c:131 sm/gpgsm.c:271 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:85 tools/gpgconf.c:117
+#: agent/gpg-agent.c:191 g10/gpg.c:583 g10/gpgv.c:78 kbx/kbxutil.c:89
+#: scd/scdaemon.c:131 sm/gpgsm.c:272 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:198 tools/gpg-connect-agent.c:86 tools/gpgconf.c:117
 msgid "verbose"
 msgstr "囉唆模�"
 
-#: agent/gpg-agent.c:190 g10/gpg.c:584 g10/gpgv.c:79 kbx/kbxutil.c:90
-#: scd/scdaemon.c:132 sm/gpgsm.c:273 dirmngr/dirmngr-client.c:70
+#: agent/gpg-agent.c:192 g10/gpg.c:585 g10/gpgv.c:79 kbx/kbxutil.c:90
+#: scd/scdaemon.c:132 sm/gpgsm.c:274 dirmngr/dirmngr-client.c:70
 #: dirmngr/dirmngr.c:199
 msgid "be somewhat more quiet"
 msgstr "盡�安�些"
 
-#: agent/gpg-agent.c:198 g10/gpg.c:599 sm/gpgsm.c:287 dirmngr/dirmngr.c:209
+#: agent/gpg-agent.c:200 g10/gpg.c:600 sm/gpgsm.c:288 dirmngr/dirmngr.c:209
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|檔案|將伺�器模�日誌寫入至指定檔案"
 
-#: agent/gpg-agent.c:202 g10/gpg.c:605 scd/scdaemon.c:146 sm/gpgsm.c:294
+#: agent/gpg-agent.c:204 g10/gpg.c:606 scd/scdaemon.c:146 sm/gpgsm.c:295
 #: dirmngr/dirmngr.c:213
 msgid "Options controlling the configuration"
 msgstr "控制著組態的�項"
 
-#: agent/gpg-agent.c:205
+#: agent/gpg-agent.c:207
 msgid "do not use the SCdaemon"
 msgstr "��使用 SCdaemon"
 
-#: agent/gpg-agent.c:207
+#: agent/gpg-agent.c:209
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|使用 PGM �為 SCdaemon 程�"
 
-#: agent/gpg-agent.c:209
+#: agent/gpg-agent.c:211
 #, fuzzy
 #| msgid "|PGM|use PGM as the SCdaemon program"
 msgid "|PGM|use PGM as the tpm2daemon program"
 msgstr "|PGM|使用 PGM �為 SCdaemon 程�"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:215
 #, fuzzy
 #| msgid "|NAME|connect to host NAME"
 msgid "|NAME|accept some commands via NAME"
 msgstr "|�稱|連線至�於指定�稱的主機"
 
-#: agent/gpg-agent.c:217
+#: agent/gpg-agent.c:219
 msgid "ignore requests to change the TTY"
 msgstr "忽略變更 TTY 的�求"
 
-#: agent/gpg-agent.c:219
+#: agent/gpg-agent.c:221
 msgid "ignore requests to change the X display"
 msgstr "忽略變更 X display 的�求"
 
-#: agent/gpg-agent.c:220
+#: agent/gpg-agent.c:222
 msgid "enable ssh support"
 msgstr "啟用 ssh 支�"
 
-#: agent/gpg-agent.c:222
+#: agent/gpg-agent.c:224
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr ""
 
-#: agent/gpg-agent.c:225
+#: agent/gpg-agent.c:227
 msgid "enable putty support"
 msgstr "啟用 putty 支�"
 
-#: agent/gpg-agent.c:237 g10/gpg.c:850 scd/scdaemon.c:176 sm/gpgsm.c:388
+#: agent/gpg-agent.c:239 g10/gpg.c:851 scd/scdaemon.c:176 sm/gpgsm.c:389
 msgid "Options controlling the security"
 msgstr "控制著安全性的�項"
 
-#: agent/gpg-agent.c:240
+#: agent/gpg-agent.c:242
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|讓快��的個人識別碼 (PIN) 在 N 秒後到期"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:244
 msgid "|N|expire SSH keys after N seconds"
 msgstr "|N|在 N 秒之後讓 SSH 金鑰�期"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:246
 msgid "|N|set maximum PIN cache lifetime to N seconds"
 msgstr "|N|把個人識別碼 (PIN) 快�最大生存時間設� N 秒"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:248
 msgid "|N|set maximum SSH key lifetime to N seconds"
 msgstr "|N|把 SSH 金鑰最大生存時間設� N 秒"
 
-#: agent/gpg-agent.c:248
+#: agent/gpg-agent.c:250
 msgid "do not use the PIN cache when signing"
 msgstr "簽署時��使用個人識別碼 (PIN) 快�"
 
-#: agent/gpg-agent.c:250
+#: agent/gpg-agent.c:252
 #, fuzzy
 #| msgid "do not allow the reuse of old passphrases"
 msgid "disallow the use of an external password cache"
 msgstr "��許�複使用舊密語"
 
-#: agent/gpg-agent.c:252
+#: agent/gpg-agent.c:254
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "��許用戶端將金鑰標記為 \"已信任\""
 
-#: agent/gpg-agent.c:255
+#: agent/gpg-agent.c:259
 msgid "allow presetting passphrase"
 msgstr "�許�先設定密語"
 
-#: agent/gpg-agent.c:260
+#: agent/gpg-agent.c:264
 msgid "Options enforcing a passphrase policy"
 msgstr "強制執行密語原則的�項"
 
-#: agent/gpg-agent.c:263
+#: agent/gpg-agent.c:267
 msgid "do not allow bypassing the passphrase policy"
 msgstr "��許略�密語原則"
 
-#: agent/gpg-agent.c:265
+#: agent/gpg-agent.c:269
 msgid "|N|set minimal required length for new passphrases to N"
 msgstr "|N|把新密語所需的最短長度設� N"
 
-#: agent/gpg-agent.c:267
+#: agent/gpg-agent.c:271
 msgid "|N|require at least N non-alpha characters for a new passphrase"
 msgstr "|N|新密語至少�有 N 個�字�的字符"
 
-#: agent/gpg-agent.c:270
+#: agent/gpg-agent.c:274
 msgid "|FILE|check new passphrases against pattern in FILE"
 msgstr "|檔案|用指定檔案中的樣�來檢查新密語"
 
-#: agent/gpg-agent.c:274
+#: agent/gpg-agent.c:278
 msgid "|N|expire the passphrase after N days"
 msgstr "|N|在 N 天之後讓密語�期"
 
-#: agent/gpg-agent.c:276
+#: agent/gpg-agent.c:280
 msgid "do not allow the reuse of old passphrases"
 msgstr "��許�複使用舊密語"
 
-#: agent/gpg-agent.c:279
+#: agent/gpg-agent.c:283
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the PIN-Entry"
 msgstr "控制著安全性的�項"
 
-#: agent/gpg-agent.c:281
+#: agent/gpg-agent.c:285
 msgid "never use the PIN-entry"
 msgstr ""
 
-#: agent/gpg-agent.c:283
+#: agent/gpg-agent.c:287
 msgid "disallow caller to override the pinentry"
 msgstr ""
 
-#: agent/gpg-agent.c:285
+#: agent/gpg-agent.c:289
 #, fuzzy
 #| msgid "do not grab keyboard and mouse"
 msgid "let PIN-Entry grab keyboard and mouse"
 msgstr "��奪��盤�滑鼠"
 
-#: agent/gpg-agent.c:288
+#: agent/gpg-agent.c:292
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|使用 PGM �為 PIN-Entry 程�"
 
-#: agent/gpg-agent.c:292
+#: agent/gpg-agent.c:296
 #, fuzzy
 #| msgid "|N|set LDAP timeout to N seconds"
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|把 LDAP 逾時設� N 秒"
 
-#: agent/gpg-agent.c:296
+#: agent/gpg-agent.c:300
 msgid "allow passphrase to be prompted through Emacs"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:562 agent/preset-passphrase.c:99 agent/protect-tool.c:154
-#: g10/gpg.c:1149 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:312
-#: sm/gpgsm.c:617 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
-#: tools/gpg-connect-agent.c:220 tools/gpgconf.c:163
+#: agent/gpg-agent.c:561 agent/preset-passphrase.c:99 agent/protect-tool.c:154
+#: g10/gpg.c:1150 g10/gpgv.c:149 kbx/kbxutil.c:118 scd/scdaemon.c:313
+#: sm/gpgsm.c:627 dirmngr/dirmngr-client.c:167 dirmngr/dirmngr.c:455
+#: tools/gpg-connect-agent.c:223 tools/gpgconf.c:163
 #: tools/gpg-check-pattern.c:143
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "翻譯瑕疵請回報給 <Jedi@Jedi.org>, 程�瑕疵則請回報給 <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:571
+#: agent/gpg-agent.c:570
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "用法: @GPG_AGENT@ [�項] (或用 -h 求助)"
 
-#: agent/gpg-agent.c:573
+#: agent/gpg-agent.c:572
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -659,132 +645,137 @@ msgstr ""
 "語法: @GPG_AGENT@ [�項] [指令 [引數]]\n"
 "@GNUPG@ �鑰管�\n"
 
-#: agent/gpg-agent.c:618 g10/gpg.c:1354 scd/scdaemon.c:384 sm/gpgsm.c:765
+#: agent/gpg-agent.c:617 g10/gpg.c:1355 scd/scdaemon.c:385 sm/gpgsm.c:775
 #: dirmngr/dirmngr.c:539
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "給定的除錯等級 '%s' 無效\n"
 
-#: agent/gpg-agent.c:991 g10/gpg.c:3955 g10/gpg.c:3979 sm/gpgsm.c:1639
-#: sm/gpgsm.c:1645
+#: agent/gpg-agent.c:993 g10/gpg.c:3956 g10/gpg.c:3980 sm/gpgsm.c:1660
+#: sm/gpgsm.c:1666
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "所�的摘�演算法無效\n"
 
-#: agent/gpg-agent.c:1215 agent/gpg-agent.c:2041 common/comopt.c:93
-#: g10/gpg.c:2622 scd/scdaemon.c:549 sm/gpgsm.c:1032 dirmngr/dirmngr.c:1072
-#: dirmngr/dirmngr.c:1943
+#: agent/gpg-agent.c:1222 agent/gpg-agent.c:2051 common/comopt.c:93
+#: g10/gpg.c:2623 scd/scdaemon.c:550 sm/gpgsm.c:1042 dirmngr/dirmngr.c:1072
+#: dirmngr/dirmngr.c:1947
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "從 '%s' 讀��項中\n"
 
-#: agent/gpg-agent.c:1331 g10/gpg.c:3896 scd/scdaemon.c:687 sm/gpgsm.c:1578
-#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1271 tools/gpgconf.c:691
+#: agent/gpg-agent.c:1338 g10/gpg.c:3897 scd/scdaemon.c:688 sm/gpgsm.c:1597
+#: dirmngr/dirmngr.c:1189 tools/gpg-connect-agent.c:1272 tools/gpgconf.c:691
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "請注�: '%s' 並�當��項\n"
 
-#: agent/gpg-agent.c:2194 scd/scdaemon.c:1108 dirmngr/dirmngr.c:1350
+#: agent/gpg-agent.c:1389 g10/misc.c:1188 dirmngr/dirmngr.c:1281
+#, c-format
+msgid "WARNING: \"%s\" is a deprecated option\n"
+msgstr "警告: 已�建議使用 \"%s\" �項\n"
+
+#: agent/gpg-agent.c:2204 scd/scdaemon.c:1109 dirmngr/dirmngr.c:1354
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 socket: %s\n"
 
-#: agent/gpg-agent.c:2211 scd/scdaemon.c:1121 dirmngr/dirmngr.c:1363
+#: agent/gpg-agent.c:2221 scd/scdaemon.c:1122 dirmngr/dirmngr.c:1367
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "socket �稱 '%s' 太長\n"
 
-#: agent/gpg-agent.c:2249
+#: agent/gpg-agent.c:2259
 #, c-format
 msgid "trying to steal socket from running %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2255
+#: agent/gpg-agent.c:2265
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "已經有一份 gpg-agent 在執行了 - �會�啟動一份新的\n"
 
-#: agent/gpg-agent.c:2267 scd/scdaemon.c:1145 dirmngr/dirmngr.c:1399
+#: agent/gpg-agent.c:2277 scd/scdaemon.c:1146 dirmngr/dirmngr.c:1403
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "為 socket �得 nonce 時出錯\n"
 
-#: agent/gpg-agent.c:2272 scd/scdaemon.c:1148 dirmngr/dirmngr.c:1402
+#: agent/gpg-agent.c:2282 scd/scdaemon.c:1149 dirmngr/dirmngr.c:1406
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "�定 socket 至 '%s' 時出錯: %s\n"
 
-#: agent/gpg-agent.c:2283 agent/gpg-agent.c:2323 agent/gpg-agent.c:2332
-#: scd/scdaemon.c:1156 dirmngr/dirmngr.c:1411
+#: agent/gpg-agent.c:2293 agent/gpg-agent.c:2333 agent/gpg-agent.c:2342
+#: scd/scdaemon.c:1157 dirmngr/dirmngr.c:1415
 #, 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:2297 scd/scdaemon.c:1168 dirmngr/dirmngr.c:1423
+#: agent/gpg-agent.c:2307 scd/scdaemon.c:1169 dirmngr/dirmngr.c:1427
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "正在候� socket '%s'\n"
 
-#: agent/gpg-agent.c:2317 agent/gpg-agent.c:2370 common/homedir.c:762
+#: agent/gpg-agent.c:2327 agent/gpg-agent.c:2380 common/homedir.c:762
 #: g10/openfile.c:399 g10/photoid.c:379
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "無法建立目錄 '%s': %s\n"
 
-#: agent/gpg-agent.c:2320 agent/gpg-agent.c:2375 common/homedir.c:765
+#: agent/gpg-agent.c:2330 agent/gpg-agent.c:2385 common/homedir.c:765
 #: g10/openfile.c:402
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "目錄 '%s' 已建立\n"
 
-#: agent/gpg-agent.c:2381
+#: agent/gpg-agent.c:2391
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "'%s' 的 stat() 失敗: %s\n"
 
-#: agent/gpg-agent.c:2385
+#: agent/gpg-agent.c:2395
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "無法使用 '%s' �為家目錄\n"
 
-#: agent/gpg-agent.c:2540 scd/scdaemon.c:1184 dirmngr/dirmngr.c:2172
+#: agent/gpg-agent.c:2550 scd/scdaemon.c:1185 dirmngr/dirmngr.c:2176
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "於 fd %d 讀� nonce 時出錯: %s\n"
 
-#: agent/gpg-agent.c:2747
+#: agent/gpg-agent.c:2757
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "經手程� 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:2752
+#: agent/gpg-agent.c:2762
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "經手程� 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:2827
+#: agent/gpg-agent.c:2837
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh 經手程� 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:2832
+#: agent/gpg-agent.c:2842
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh 經手程� 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:3054 scd/scdaemon.c:1375 dirmngr/dirmngr.c:2386
+#: agent/gpg-agent.c:3058 scd/scdaemon.c:1376 dirmngr/dirmngr.c:2390
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_select 失敗: %s - 等 1 秒�\n"
 
-#: agent/gpg-agent.c:3142 scd/scdaemon.c:1444
+#: agent/gpg-agent.c:3146 scd/scdaemon.c:1445
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已�止\n"
 
-#: agent/gpg-agent.c:3283 common/simple-pwquery.c:247 g10/call-agent.c:260
-#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2320 tools/card-call-scd.c:311
+#: agent/gpg-agent.c:3287 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: sm/call-agent.c:131 tools/gpg-connect-agent.c:2321 tools/card-call-scd.c:311
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "在此階段中沒有執行中的 gpg-agent\n"
@@ -809,7 +800,7 @@ msgstr ""
 "語法: gpg-preset-passphrase [�項] 金鑰鑰柄\n"
 "密碼快�維護\n"
 
-#: agent/protect-tool.c:107 g10/gpg.c:453 kbx/kbxutil.c:72 sm/gpgsm.c:219
+#: agent/protect-tool.c:107 g10/gpg.c:454 kbx/kbxutil.c:72 sm/gpgsm.c:220
 #: dirmngr/dirmngr.c:171 tools/gpgconf.c:86
 msgid ""
 "@Commands:\n"
@@ -819,7 +810,7 @@ msgstr ""
 " "
 
 #: agent/protect-tool.c:116 g10/gpgv.c:76 kbx/kbxutil.c:82
-#: tools/gpg-connect-agent.c:83 tools/gpgconf.c:114
+#: tools/gpg-connect-agent.c:84 tools/gpgconf.c:114
 msgid ""
 "@\n"
 "Options:\n"
@@ -873,42 +864,42 @@ msgstr "已�消\n"
 msgid "error while asking for the passphrase: %s\n"
 msgstr "詢�密語時出錯: %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:366 tools/gpgconf.c:480
+#: agent/trustlist.c:172 agent/trustlist.c:391 tools/gpgconf.c:480
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "開啟 '%s' 時出錯: %s\n"
 
-#: agent/trustlist.c:170 common/helpfile.c:73 common/helpfile.c:89
+#: agent/trustlist.c:188 common/helpfile.c:73 common/helpfile.c:89
 #, c-format
 msgid "file '%s', line %d: %s\n"
 msgstr "檔案 '%s', 第 %d 列: %s\n"
 
-#: agent/trustlist.c:193 agent/trustlist.c:201
+#: agent/trustlist.c:211 agent/trustlist.c:219
 #, c-format
 msgid "statement \"%s\" ignored in '%s', line %d\n"
 msgstr "陳述� \"%s\" 忽略於 '%s', 第 %d 列\n"
 
-#: agent/trustlist.c:207
+#: agent/trustlist.c:225
 #, c-format
 msgid "system trustlist '%s' not available\n"
 msgstr "沒有系統信任清單 '%s' �用\n"
 
-#: agent/trustlist.c:251
+#: agent/trustlist.c:269
 #, c-format
 msgid "bad fingerprint in '%s', line %d\n"
 msgstr "�良的指紋於 '%s', 第 %d 列\n"
 
-#: agent/trustlist.c:276 agent/trustlist.c:283
+#: agent/trustlist.c:294 agent/trustlist.c:301
 #, c-format
 msgid "invalid keyflag in '%s', line %d\n"
 msgstr "無效的金鑰旗標於 '%s', 第 %d 列\n"
 
-#: agent/trustlist.c:319 common/helpfile.c:136
+#: agent/trustlist.c:337 common/helpfile.c:136
 #, c-format
 msgid "error reading '%s', line %d: %s\n"
 msgstr "讀� '%s' 時出錯, 第 %d 列: %s\n"
 
-#: agent/trustlist.c:437 agent/trustlist.c:506
+#: agent/trustlist.c:462 agent/trustlist.c:531
 #, c-format
 msgid "error reading list of trusted root certificates\n"
 msgstr "讀�已信任根憑證清單時出錯\n"
@@ -921,18 +912,18 @@ msgstr "讀�已信任根憑證清單時出錯\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:668
+#: agent/trustlist.c:693
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr "請�你是�徹底信任%%0A  \"%s\"%%0A正確驗證使用者憑證的能力?"
 
-#: agent/trustlist.c:677 common/audit.c:467
+#: agent/trustlist.c:702 common/audit.c:467
 msgid "Yes"
 msgstr "Yes"
 
-#: agent/trustlist.c:677 agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/trustlist.c:702 agent/findkey.c:1765 agent/findkey.c:1779
 #: common/audit.c:469
 msgid "No"
 msgstr "No"
@@ -945,7 +936,7 @@ msgstr "No"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:711
+#: agent/trustlist.c:736
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -955,35 +946,53 @@ msgstr "請驗證憑證與此完全相�:%%0A  \"%s\"%%0A其指紋為:%%0A  %s"
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Correct"
 msgstr "正確"
 
-#: agent/trustlist.c:725
+#: agent/trustlist.c:750
 msgid "Wrong"
 msgstr "錯了"
 
-#: agent/findkey.c:367
+#: agent/findkey.c:388 dirmngr/crlcache.c:948
+#, c-format
+msgid "error renaming '%s' to '%s': %s\n"
+msgstr "把 '%s' �新命�� '%s' 時出錯: %s\n"
+
+#: agent/findkey.c:421
 #, c-format
 msgid "Note: This passphrase has never been changed.%0APlease change it now."
 msgstr "請注�: 密語從未變更�.%0A請�在就變更."
 
-#: agent/findkey.c:383
+#: agent/findkey.c:437
 #, c-format
 msgid ""
 "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
 "it now."
 msgstr "密語從下列時刻起就沒有變更�:%%0A%.4s-%.2s-%.2s.  請�在就變更."
 
-#: agent/findkey.c:397 agent/findkey.c:404
+#: agent/findkey.c:451 agent/findkey.c:458
 msgid "Change passphrase"
 msgstr "更改密語"
 
-#: agent/findkey.c:405
+#: agent/findkey.c:459
 msgid "I'll change it later"
 msgstr "我�後�變更"
 
-#: agent/findkey.c:1472
+#: agent/findkey.c:1120
+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?"
+msgid "Requested the use of key%%0A  %s%%0A  %s%%0ADo you want to allow this?"
+msgstr ""
+"有�個 ssh 程��出使用金鑰 %%0A  %s%%0A  (%s)%%0A 之請求, 請�是��許?"
+
+#: agent/findkey.c:1741
 #, fuzzy, c-format
 #| msgid "Do you really want to delete the selected keys? (y/N) "
 msgid ""
@@ -991,11 +1000,11 @@ msgid ""
 "%%0A?"
 msgstr "你真的想�刪除所�的金鑰嗎? (y/N) "
 
-#: agent/findkey.c:1496 agent/findkey.c:1510
+#: agent/findkey.c:1765 agent/findkey.c:1779
 msgid "Delete key"
 msgstr "刪除金鑰"
 
-#: agent/findkey.c:1507
+#: agent/findkey.c:1776
 msgid ""
 "Warning: This key is also listed for use with SSH!\n"
 "Deleting the key might remove your ability to access remote machines."
@@ -1019,7 +1028,7 @@ msgstr "金鑰 %s 使用�安全 (%u �元) 的雜湊\n"
 msgid "a %zu bit hash is not valid for a %u bit %s key\n"
 msgstr "%zu �元的雜湊� %u �元的 %s 金鑰無效\n"
 
-#: agent/pksign.c:572
+#: agent/pksign.c:566
 #, c-format
 msgid "checking created signature failed: %s\n"
 msgstr "檢查已建立的簽章時出錯: %s\n"
@@ -1058,7 +1067,7 @@ 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:1441
+#: common/exechelp-posix.c:875 dirmngr/dirmngr.c:1445
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "�生執行程�時出錯: %s\n"
@@ -1120,13 +1129,13 @@ msgstr "警告: %s 的所有權 \"%s\" 並�安全\n"
 msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告: %s 的權� \"%s\" 並�安全\n"
 
-#: common/sysutils.c:905
+#: common/sysutils.c:880
 #, fuzzy, c-format
 #| msgid "waiting for the agent to come up ... (%ds)\n"
 msgid "waiting for file '%s' to become accessible ...\n"
 msgstr "正在等候代�程�出� ... (%d 秒)\n"
 
-#: common/sysutils.c:931
+#: common/sysutils.c:906
 #, c-format
 msgid "renaming '%s' to '%s' failed: %s\n"
 msgstr "把 '%s' �新新命� '%s' 時失敗: %s\n"
@@ -1349,7 +1358,7 @@ msgid "algorithm: %s"
 msgstr "演算法: %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:4215
+#: scd/app-openpgp.c:4246
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "未支�的演算法: %s"
@@ -1504,7 +1513,7 @@ msgstr "沒有從 '%s' 到 '%s' 之間的轉��用\n"
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open 失敗: %s\n"
 
-#: common/utf8conv.c:389 common/utf8conv.c:655
+#: common/utf8conv.c:387 common/utf8conv.c:653
 #, c-format
 msgid "conversion from '%s' to '%s' failed: %s\n"
 msgstr "從 '%s' 轉�到 '%s' 失敗: %s\n"
@@ -1543,7 +1552,7 @@ msgstr "未鎖定 '%s': %s\n"
 msgid "waiting for lock %s...\n"
 msgstr "正在等候 `%s' 鎖定...\n"
 
-#: common/init.c:191 sm/gpgsm.c:913 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
+#: common/init.c:170 sm/gpgsm.c:923 dirmngr/dirmngr.c:978 dirmngr/dirmngr.c:987
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太舊了 (需� %s, 但是祇有 %s)\n"
@@ -1714,7 +1723,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:2317
+#: g10/call-dirmngr.c:178 sm/call-dirmngr.c:238 tools/gpg-connect-agent.c:2318
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no dirmngr running in this session\n"
@@ -1760,7 +1769,7 @@ msgstr ""
 msgid "server uses an invalid certificate"
 msgstr "產生撤銷憑證"
 
-#: g10/call-dirmngr.c:405 g10/gpg.c:4644 sm/call-dirmngr.c:455
+#: g10/call-dirmngr.c:405 g10/gpg.c:4645 sm/call-dirmngr.c:455
 #, fuzzy, c-format
 #| msgid "armor: %s\n"
 msgid "Note: %s\n"
@@ -1788,7 +1797,7 @@ msgstr "無法在批次模�中這樣�\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "祇有第二版�片纔能用這個指令\n"
 
-#: g10/card-util.c:107 scd/app-openpgp.c:3400 tools/gpg-card.c:2965
+#: g10/card-util.c:107 scd/app-openpgp.c:3431 tools/gpg-card.c:2965
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "(�也) 沒有�設碼\n"
@@ -1853,14 +1862,14 @@ msgstr "�回公鑰的 URL: "
 
 #: g10/card-util.c:964 g10/decrypt-data.c:508 g10/import.c:414 g10/import.c:764
 #: g10/import.c:823 dirmngr/crlcache.c:655 dirmngr/crlcache.c:660
-#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1753
+#: dirmngr/crlcache.c:914 dirmngr/crlcache.c:920 dirmngr/dirmngr.c:1757
 #: tools/gpgconf.c:493 tools/gpgconf.c:539 tools/gpg-card.c:426
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "讀� '%s' 時出錯: %s\n"
 
-#: g10/card-util.c:997 g10/decrypt-data.c:511 g10/export.c:2589
-#: g10/export.c:2890 dirmngr/crlcache.c:925 tools/gpg-card.c:486
+#: 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:486
 #: tools/gpg-card.c:493
 #, c-format
 msgid "error writing '%s': %s\n"
@@ -2216,26 +2225,26 @@ msgstr "未�許使用管�者指令\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
-#: g10/decrypt.c:191 g10/encrypt.c:1219
+#: g10/decrypt.c:186 g10/encrypt.c:1219
 #, c-format
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個指令中沒有作用\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5363 g10/keyring.c:399 g10/keyring.c:750
+#: g10/decrypt.c:242 g10/gpg.c:5385 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "無法開啟 '%s'\n"
 
-#: g10/delkey.c:81 g10/export.c:1977 g10/export.c:2435 g10/export.c:2556
-#: g10/export.c:2702 g10/getkey.c:2032 g10/gpg.c:5308 g10/keyedit.c:1450
-#: g10/keyedit.c:2382 g10/keyedit.c:2626 g10/keyedit.c:4580 g10/keylist.c:707
+#: g10/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:5330 g10/keyedit.c:1450
+#: g10/keyedit.c:2382 g10/keyedit.c:2682 g10/keyedit.c:4636 g10/keylist.c:707
 #: g10/keyserver.c:1071 g10/revoke.c:230 g10/tofu.c:2172
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "找�到金鑰 \"%s\": %s\n"
 
 #: g10/delkey.c:90 g10/export.c:2012 g10/getkey.c:2040 g10/getkey.c:4457
-#: g10/gpg.c:5317 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
+#: g10/gpg.c:5339 g10/keyedit.c:2354 g10/keyserver.c:1089 g10/revoke.c:236
 #: g10/revoke.c:666 g10/tofu.c:2180
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2295,8 +2304,8 @@ msgid "subkey"
 msgstr "�鑰"
 
 #: g10/delkey.c:299 g10/keyedit.c:2247 g10/keyedit.c:2257 g10/keyedit.c:2435
-#: g10/keyedit.c:2509 g10/keyedit.c:2580 g10/keyedit.c:2793 g10/keyedit.c:3023
-#: g10/keyedit.c:3092 g10/keyedit.c:3242
+#: g10/keyedit.c:2566 g10/keyedit.c:2636 g10/keyedit.c:2849 g10/keyedit.c:3079
+#: g10/keyedit.c:3148 g10/keyedit.c:3298
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失敗: %s\n"
@@ -2358,15 +2367,15 @@ msgstr "你�該將 '%s' 編密演算法用於 %s 模�\n"
 msgid "(use option \"%s\" to override)\n"
 msgstr ""
 
-#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4128
-#: g10/gpg.c:4175 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1663
+#: g10/encrypt.c:549 g10/encrypt.c:802 g10/decrypt-data.c:265 g10/gpg.c:4129
+#: g10/gpg.c:4176 sm/decrypt.c:1182 sm/encrypt.c:692 sm/gpgsm.c:1684
 #, fuzzy, c-format
 #| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "你�該將 '%s' 編密演算法用於 %s 模�\n"
 
-#: g10/encrypt.c:558 g10/gpg.c:4140 g10/gpg.c:4187 g10/sig-check.c:184
-#: g10/sign.c:452 sm/gpgsm.c:1673 sm/gpgsm.c:1683 sm/sign.c:597 sm/verify.c:510
+#: g10/encrypt.c:558 g10/gpg.c:4141 g10/gpg.c:4188 g10/sig-check.c:184
+#: g10/sign.c:452 sm/gpgsm.c:1694 sm/gpgsm.c:1704 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"
@@ -2389,7 +2398,7 @@ msgstr "警告: 強迫使用 %s (%d) å°�稱å¼�編密法會é�•å��收件者å��好è
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "警告: \"%s%s\" 是已廢棄的�項 - 沒有效果\n"
 
-#: g10/encrypt.c:854 g10/mainproc.c:853 g10/mainproc.c:2476 sm/decrypt.c:1395
+#: g10/encrypt.c:854 g10/mainproc.c:865 g10/mainproc.c:2488 sm/decrypt.c:1395
 #: sm/encrypt.c:817 sm/verify.c:526
 #, c-format
 msgid "operation forced to fail due to unfulfilled compliance rules\n"
@@ -2490,12 +2499,12 @@ msgstr "��許匯出�鑰\n"
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "金鑰 %s: PGP 2.x 型態的金鑰 - 已跳�\n"
 
-#: g10/export.c:2129
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "警告: 沒有匯出任何�西\n"
 
-#: g10/export.c:2571 g10/export.c:2866 g10/plaintext.c:152 g10/plaintext.c:161
+#: g10/export.c:2577 g10/export.c:2872 g10/plaintext.c:152 g10/plaintext.c:161
 #: g10/plaintext.c:167
 #, c-format
 msgid "error creating '%s': %s\n"
@@ -2562,291 +2571,291 @@ msgstr "無效的金鑰 %s �以藉由 --allow-non-selfsigned-uid 而生效\n"
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用�鑰 %s 來替�主鑰 %s\n"
 
-#: g10/getkey.c:4386 g10/gpg.c:2191
+#: g10/getkey.c:4386 g10/gpg.c:2192
 #, fuzzy, c-format
 #| msgid "invalid argument for option \"%.50s\"\n"
 msgid "valid values for option '%s':\n"
 msgstr "�項 \"%.50s\" 的引數無效\n"
 
-#: g10/gpg.c:455 sm/gpgsm.c:221
+#: g10/gpg.c:456 sm/gpgsm.c:222
 msgid "make a signature"
 msgstr "建立簽章"
 
-#: g10/gpg.c:456
+#: g10/gpg.c:457
 msgid "make a clear text signature"
 msgstr "建立明文簽章"
 
-#: g10/gpg.c:458 sm/gpgsm.c:223
+#: g10/gpg.c:459 sm/gpgsm.c:224
 msgid "make a detached signature"
 msgstr "建立分離�簽章"
 
-#: g10/gpg.c:459 sm/gpgsm.c:224
+#: g10/gpg.c:460 sm/gpgsm.c:225
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:461
+#: g10/gpg.c:462
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用�稱�編密法來加密"
 
-#: g10/gpg.c:463 sm/gpgsm.c:226
+#: g10/gpg.c:464 sm/gpgsm.c:227
 msgid "decrypt data (default)"
 msgstr "資料解密 (�設)"
 
-#: g10/gpg.c:465 sm/gpgsm.c:227
+#: g10/gpg.c:466 sm/gpgsm.c:228
 msgid "verify a signature"
 msgstr "驗證簽章"
 
-#: g10/gpg.c:467 sm/gpgsm.c:228
+#: g10/gpg.c:468 sm/gpgsm.c:229
 msgid "list keys"
 msgstr "列出金鑰"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "list keys and signatures"
 msgstr "列出金鑰和簽章"
 
-#: g10/gpg.c:472
+#: g10/gpg.c:473
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:474 sm/gpgsm.c:233
+#: g10/gpg.c:475 sm/gpgsm.c:234
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:475 sm/gpgsm.c:231
+#: g10/gpg.c:476 sm/gpgsm.c:232
 msgid "list secret keys"
 msgstr "列出�鑰"
 
-#: g10/gpg.c:477 sm/gpgsm.c:234
+#: g10/gpg.c:478 sm/gpgsm.c:235
 msgid "generate a new key pair"
 msgstr "產生新的金鑰�"
 
-#: g10/gpg.c:480
+#: g10/gpg.c:481
 msgid "quickly generate a new key pair"
 msgstr "快速產生新的金鑰�"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly add a new user-id"
 msgstr "快速產生新的金鑰�"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:489
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly revoke a user-id"
 msgstr "快速產生新的金鑰�"
 
-#: g10/gpg.c:491
+#: g10/gpg.c:492
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly set a new expiration date"
 msgstr "快速產生新的金鑰�"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:495
 msgid "full featured key pair generation"
 msgstr "全能金鑰�生�"
 
-#: g10/gpg.c:497
+#: g10/gpg.c:498
 msgid "generate a revocation certificate"
 msgstr "產生撤銷憑證"
 
-#: g10/gpg.c:500 sm/gpgsm.c:237
+#: g10/gpg.c:501 sm/gpgsm.c:238
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移除金鑰"
 
-#: g10/gpg.c:502
+#: g10/gpg.c:503
 msgid "remove keys from the secret keyring"
 msgstr "從�鑰鑰匙圈裡移除金鑰"
 
-#: g10/gpg.c:504
+#: g10/gpg.c:505
 msgid "quickly sign a key"
 msgstr "快速簽署金鑰"
 
-#: g10/gpg.c:506
+#: g10/gpg.c:507
 msgid "quickly sign a key locally"
 msgstr "快速在本機簽署金鑰"
 
-#: g10/gpg.c:508
+#: g10/gpg.c:509
 #, fuzzy
 #| msgid "quickly generate a new key pair"
 msgid "quickly revoke a key signature"
 msgstr "快速產生新的金鑰�"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:510
 msgid "sign a key"
 msgstr "簽署金鑰"
 
-#: g10/gpg.c:510
+#: g10/gpg.c:511
 msgid "sign a key locally"
 msgstr "僅在本機簽署金鑰"
 
-#: g10/gpg.c:511
+#: g10/gpg.c:512
 msgid "sign or edit a key"
 msgstr "簽署或編輯金鑰"
 
-#: g10/gpg.c:513 sm/gpgsm.c:255
+#: g10/gpg.c:514 sm/gpgsm.c:256
 msgid "change a passphrase"
 msgstr "更改密語"
 
-#: g10/gpg.c:517
+#: g10/gpg.c:518
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:518
+#: g10/gpg.c:519
 msgid "export keys to a keyserver"
 msgstr "把金鑰匯出至金鑰伺�器"
 
-#: g10/gpg.c:519
+#: g10/gpg.c:520
 msgid "import keys from a keyserver"
 msgstr "從金鑰伺�器匯入金鑰"
 
-#: g10/gpg.c:522
+#: g10/gpg.c:523
 msgid "search for keys on a keyserver"
 msgstr "在金鑰伺�器上�尋金鑰"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "update all keys from a keyserver"
 msgstr "從金鑰伺�器更新所有的金鑰"
 
-#: g10/gpg.c:533
+#: g10/gpg.c:534
 msgid "import/merge keys"
 msgstr "匯入/�併金鑰"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:537
 msgid "print the card status"
 msgstr "列��片狀態"
 
-#: g10/gpg.c:537
+#: g10/gpg.c:538
 msgid "change data on a card"
 msgstr "變更�片上的資料"
 
-#: g10/gpg.c:539
+#: g10/gpg.c:540
 msgid "change a card's PIN"
 msgstr "變更�片的個人識別碼 (PIN)"
 
-#: g10/gpg.c:551
+#: g10/gpg.c:552
 msgid "update the trust database"
 msgstr "更新信任資料庫"
 
-#: g10/gpg.c:561
+#: g10/gpg.c:562
 msgid "print message digests"
 msgstr "�出訊�摘�"
 
-#: g10/gpg.c:565 sm/gpgsm.c:250
+#: g10/gpg.c:566 sm/gpgsm.c:251
 msgid "run in server mode"
 msgstr "以伺�器模�執行"
 
-#: g10/gpg.c:567
+#: g10/gpg.c:568
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr ""
 
-#: g10/gpg.c:610
+#: g10/gpg.c:611
 msgid "|NAME|use NAME as default secret key"
 msgstr "|�字|使用指定�字�為�設�鑰"
 
-#: g10/gpg.c:612 sm/gpgsm.c:346
+#: g10/gpg.c:613 sm/gpgsm.c:347
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|�字|也加密給指定�字的使用者 ID"
 
-#: g10/gpg.c:620
+#: g10/gpg.c:621
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|設定電�郵件別�"
 
-#: g10/gpg.c:632
+#: g10/gpg.c:633
 msgid "use strict OpenPGP behavior"
 msgstr "使用嚴謹的 OpenPGP 行為"
 
-#: g10/gpg.c:658 kbx/kbxutil.c:91 sm/gpgsm.c:430 tools/gpgconf.c:119
+#: g10/gpg.c:659 kbx/kbxutil.c:91 sm/gpgsm.c:431 tools/gpgconf.c:119
 msgid "do not make any changes"
 msgstr "���任何改變"
 
-#: g10/gpg.c:659
+#: g10/gpg.c:660
 msgid "prompt before overwriting"
 msgstr "覆寫�先詢�"
 
-#: g10/gpg.c:708 sm/gpgsm.c:316
+#: g10/gpg.c:709 sm/gpgsm.c:317
 #, fuzzy
 #| msgid "Options controlling the security"
 msgid "Options controlling the input"
 msgstr "控制著安全性的�項"
 
-#: g10/gpg.c:726 sm/gpgsm.c:326
+#: g10/gpg.c:727 sm/gpgsm.c:327
 #, fuzzy
 #| msgid "Options controlling the diagnostic output"
 msgid "Options controlling the output"
 msgstr "控制著診斷性輸出的�項"
 
-#: g10/gpg.c:728 sm/gpgsm.c:328
+#: g10/gpg.c:729 sm/gpgsm.c:329
 msgid "create ascii armored output"
 msgstr "建立以 ASCII ���的輸出"
 
-#: g10/gpg.c:732 g10/gpgv.c:82 sm/gpgsm.c:333
+#: g10/gpg.c:733 g10/gpgv.c:82 sm/gpgsm.c:334
 msgid "|FILE|write output to FILE"
 msgstr "|檔案|將輸出寫入至指定檔案"
 
-#: g10/gpg.c:745
+#: g10/gpg.c:746
 msgid "use canonical text mode"
 msgstr "使用標準的文字模�"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:764
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示�壓縮)"
 
-#: g10/gpg.c:769 sm/gpgsm.c:363
+#: g10/gpg.c:770 sm/gpgsm.c:364
 #, fuzzy
 #| msgid "Options controlling the interactivity and enforcement"
 msgid "Options controlling key import and export"
 msgstr "控制著互動�強制執行的�項"
 
-#: g10/gpg.c:772
+#: g10/gpg.c:773
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|使用 MECHANISMS 機制來從郵件地�找出金鑰"
 
-#: g10/gpg.c:775
+#: g10/gpg.c:776
 #, fuzzy
 #| msgid "import keys from a keyserver"
 msgid "import missing key from a signature"
 msgstr "從金鑰伺�器匯入金鑰"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:781
 #, fuzzy
 #| msgid "list and check key signatures"
 msgid "include the public key in signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:783 sm/gpgsm.c:366
+#: g10/gpg.c:784 sm/gpgsm.c:367
 msgid "disable all access to the dirmngr"
 msgstr "�用所有的 dirmngr 存�"
 
-#: g10/gpg.c:795 sm/gpgsm.c:373
+#: g10/gpg.c:796 sm/gpgsm.c:374
 #, fuzzy
 #| msgid "Options controlling the configuration"
 msgid "Options controlling key listings"
 msgstr "控制著組態的�項"
 
-#: g10/gpg.c:825 sm/gpgsm.c:338
+#: g10/gpg.c:826 sm/gpgsm.c:339
 #, fuzzy
 #| msgid "list secret keys"
 msgid "Options to specify keys"
 msgstr "列出�鑰"
 
-#: g10/gpg.c:827 sm/gpgsm.c:340
+#: g10/gpg.c:828 sm/gpgsm.c:341
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|使用者-ID|以指定使用者 ID 作為加密�象"
 
-#: g10/gpg.c:835 sm/gpgsm.c:342
+#: g10/gpg.c:836 sm/gpgsm.c:343
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|使用者-ID|拿指定使用者 ID 來簽署或解密"
 
-#: g10/gpg.c:883 sm/gpgsm.c:414
+#: g10/gpg.c:884 sm/gpgsm.c:415
 msgid "Options for unattended use"
 msgstr ""
 
-#: g10/gpg.c:902 sm/gpgsm.c:426 dirmngr/dirmngr.c:292
+#: g10/gpg.c:903 sm/gpgsm.c:427 dirmngr/dirmngr.c:292
 msgid "Other options"
 msgstr ""
 
-#: g10/gpg.c:975 sm/gpgsm.c:458
+#: g10/gpg.c:976 sm/gpgsm.c:460
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2854,7 +2863,7 @@ msgstr ""
 "@\n"
 "(請�照線上說明��來�得所有命令和�項的完整清單)\n"
 
-#: g10/gpg.c:978
+#: g10/gpg.c:979
 #, fuzzy
 #| msgid ""
 #| "@\n"
@@ -2884,11 +2893,11 @@ msgstr ""
 " --list-keys [�字]         顯示金鑰\n"
 " --fingerprint [�字]       顯示指紋\n"
 
-#: g10/gpg.c:1171
+#: g10/gpg.c:1172
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "用法: @GPG@ [�項] [檔案] (或用 -h 求助)"
 
-#: g10/gpg.c:1174
+#: g10/gpg.c:1175
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2898,7 +2907,7 @@ msgstr ""
 "簽署, 檢查, 加密, 解密\n"
 "�設的�作會�輸入資料而定\n"
 
-#: g10/gpg.c:1185 sm/gpgsm.c:641
+#: g10/gpg.c:1186 sm/gpgsm.c:651
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2906,567 +2915,567 @@ msgstr ""
 "\n"
 "已支�的演算法:\n"
 
-#: g10/gpg.c:1188
+#: g10/gpg.c:1189
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:1195 g10/keyedit.c:3316
+#: g10/gpg.c:1196 g10/keyedit.c:3372
 msgid "Cipher: "
 msgstr "編密法: "
 
-#: g10/gpg.c:1209
+#: g10/gpg.c:1210
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:1216 g10/keyedit.c:3382
+#: g10/gpg.c:1217 g10/keyedit.c:3438
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:1291 sm/gpgsm.c:715
+#: g10/gpg.c:1292 sm/gpgsm.c:725
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "用法: %s [�項] %s\n"
 
-#: g10/gpg.c:1490 sm/gpgsm.c:808
+#: g10/gpg.c:1491 sm/gpgsm.c:818
 #, c-format
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/gpg.c:1508
+#: g10/gpg.c:1509
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "在群組定義 '%s' 裡找�到 = 記號\n"
 
-#: g10/gpg.c:1707
+#: g10/gpg.c:1708
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的所有權並�安全\n"
 
-#: g10/gpg.c:1710
+#: g10/gpg.c:1711
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的所有權並�安全\n"
 
-#: g10/gpg.c:1713
+#: g10/gpg.c:1714
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的所有權並�安全\n"
 
-#: g10/gpg.c:1719
+#: g10/gpg.c:1720
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的權�並�安全\n"
 
-#: g10/gpg.c:1722
+#: g10/gpg.c:1723
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的權�並�安全\n"
 
-#: g10/gpg.c:1725
+#: g10/gpg.c:1726
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的權�並�安全\n"
 
-#: g10/gpg.c:1731
+#: g10/gpg.c:1732
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的�入目錄所有權並�安全\n"
 
-#: g10/gpg.c:1734
+#: g10/gpg.c:1735
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的�入目錄所有權並�安全\n"
 
-#: g10/gpg.c:1737
+#: g10/gpg.c:1738
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的�入目錄所有權並�安全\n"
 
-#: g10/gpg.c:1743
+#: g10/gpg.c:1744
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "警告: 家目錄 '%s' 的�入目錄權�並�安全\n"
 
-#: g10/gpg.c:1746
+#: g10/gpg.c:1747
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "警告: 組態檔案 '%s' 的�入目錄權�並�安全\n"
 
-#: g10/gpg.c:1749
+#: g10/gpg.c:1750
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "警告: 延伸模組 '%s' 的�入目錄權�並�安全\n"
 
-#: g10/gpg.c:1965
+#: g10/gpg.c:1966
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "未知的組態項目 '%s'\n"
 
-#: g10/gpg.c:2061
+#: g10/gpg.c:2062
 msgid "display photo IDs during key listings"
 msgstr "列出金鑰時顯示照片 ID"
 
-#: g10/gpg.c:2063
+#: g10/gpg.c:2064
 msgid "show key usage information during key listings"
 msgstr "列出金鑰時顯示金鑰用途資訊"
 
-#: g10/gpg.c:2065
+#: g10/gpg.c:2066
 msgid "show policy URLs during signature listings"
 msgstr "列出簽章時顯示原則 URL"
 
-#: g10/gpg.c:2067
+#: g10/gpg.c:2068
 msgid "show all notations during signature listings"
 msgstr "列出簽章時顯示所有的註記"
 
-#: g10/gpg.c:2069
+#: g10/gpg.c:2070
 msgid "show IETF standard notations during signature listings"
 msgstr "列出簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:2073
+#: g10/gpg.c:2074
 msgid "show user-supplied notations during signature listings"
 msgstr "列出簽章時顯示使用者�供的註記"
 
-#: g10/gpg.c:2075
+#: g10/gpg.c:2076
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出簽章時顯示�好的金鑰伺�器 URL"
 
-#: g10/gpg.c:2077
+#: g10/gpg.c:2078
 msgid "show user ID validity during key listings"
 msgstr "列出金鑰時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:2079
+#: g10/gpg.c:2080
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出金鑰時顯示已撤銷或�期的使用者 ID"
 
-#: g10/gpg.c:2081
+#: g10/gpg.c:2082
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出金鑰時顯示已撤銷或�期的�鑰"
 
-#: g10/gpg.c:2083
+#: g10/gpg.c:2084
 msgid "show the keyring name in key listings"
 msgstr "在金鑰清單中顯示鑰匙圈�稱"
 
-#: g10/gpg.c:2085
+#: g10/gpg.c:2086
 msgid "show expiration dates during signature listings"
 msgstr "列出簽章時顯示有效期�"
 
-#: g10/gpg.c:2202
+#: g10/gpg.c:2203
 #, fuzzy, c-format
 #| msgid "unknown option '%s'\n"
 msgid "unknown TOFU policy '%s'\n"
 msgstr "未知的�項 '%s'\n"
 
-#: g10/gpg.c:2204
+#: g10/gpg.c:2205
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr ""
 
-#: g10/gpg.c:2319 g10/keyedit.c:1724
+#: g10/gpg.c:2320 g10/keyedit.c:1724
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模�中��許使用這個指令.\n"
 
-#: g10/gpg.c:3007 g10/gpg.c:3863 g10/gpg.c:3875
+#: g10/gpg.c:3008 g10/gpg.c:3864 g10/gpg.c:3876
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "請注�: 一般情�下�採用 %s!\n"
 
-#: g10/gpg.c:3185 g10/gpg.c:3197
+#: g10/gpg.c:3186 g10/gpg.c:3198
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "'%s' �是有效的簽章使用期�\n"
 
-#: g10/gpg.c:3219
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 #| msgid "line %d: not a valid email address\n"
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "第 %d 列: �是有效的電�郵件地�\n"
 
-#: g10/gpg.c:3251 sm/gpgsm.c:1147
+#: g10/gpg.c:3252 sm/gpgsm.c:1157
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "無效的個人識別碼項目模� '%s'\n"
 
-#: g10/gpg.c:3257 sm/gpgsm.c:1153
+#: g10/gpg.c:3258 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:3314
+#: g10/gpg.c:3315
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "'%s' �是有效的字元集\n"
 
-#: g10/gpg.c:3336 g10/gpg.c:3545 g10/keyedit.c:5322
+#: g10/gpg.c:3337 g10/gpg.c:3546 g10/keyedit.c:5378
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖�金鑰伺�器 URL\n"
 
-#: g10/gpg.c:3354
+#: g10/gpg.c:3355
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺�器�項\n"
 
-#: g10/gpg.c:3357
+#: g10/gpg.c:3358
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺�器�項\n"
 
-#: g10/gpg.c:3364
+#: g10/gpg.c:3365
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入�項\n"
 
-#: g10/gpg.c:3367
+#: g10/gpg.c:3368
 #, c-format
 msgid "invalid import options\n"
 msgstr "無效的匯入�項\n"
 
-#: g10/gpg.c:3373 g10/gpg.c:3388
+#: g10/gpg.c:3374 g10/gpg.c:3389
 #, fuzzy, c-format
 #| msgid "invalid list options\n"
 msgid "invalid filter option: %s\n"
 msgstr "無效的清單�項\n"
 
-#: g10/gpg.c:3379
+#: g10/gpg.c:3380
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出�項\n"
 
-#: g10/gpg.c:3382
+#: g10/gpg.c:3383
 #, c-format
 msgid "invalid export options\n"
 msgstr "無效的匯出�項\n"
 
-#: g10/gpg.c:3394
+#: g10/gpg.c:3395
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單�項\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3398
 #, c-format
 msgid "invalid list options\n"
 msgstr "無效的清單�項\n"
 
-#: g10/gpg.c:3405
+#: g10/gpg.c:3406
 msgid "display photo IDs during signature verification"
 msgstr "驗證簽章時顯示照片 ID"
 
-#: g10/gpg.c:3407
+#: g10/gpg.c:3408
 msgid "show policy URLs during signature verification"
 msgstr "驗證簽章時顯示原則 URL"
 
-#: g10/gpg.c:3409
+#: g10/gpg.c:3410
 msgid "show all notations during signature verification"
 msgstr "驗證簽章時顯示所有的註記"
 
-#: g10/gpg.c:3411
+#: g10/gpg.c:3412
 msgid "show IETF standard notations during signature verification"
 msgstr "驗證簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:3415
+#: g10/gpg.c:3416
 msgid "show user-supplied notations during signature verification"
 msgstr "驗證簽章時顯示使用者�供的註記"
 
-#: g10/gpg.c:3417
+#: g10/gpg.c:3418
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "驗證簽章時顯示�好的金鑰伺�器 URL"
 
-#: g10/gpg.c:3419
+#: g10/gpg.c:3420
 msgid "show user ID validity during signature verification"
 msgstr "驗證簽章時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3422
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "驗證簽章時顯示已撤銷或�期的使用者 ID"
 
-#: g10/gpg.c:3423
+#: g10/gpg.c:3424
 msgid "show only the primary user ID in signature verification"
 msgstr "驗證簽章時祇顯示主�的使用者 ID"
 
-#: g10/gpg.c:3430
+#: g10/gpg.c:3431
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證�項\n"
 
-#: g10/gpg.c:3433
+#: g10/gpg.c:3434
 #, c-format
 msgid "invalid verify options\n"
 msgstr "無效的驗證�項\n"
 
-#: g10/gpg.c:3440
+#: g10/gpg.c:3441
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設� %s\n"
 
-#: g10/gpg.c:3647
+#: g10/gpg.c:3648
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的自動金鑰定�清單\n"
 
-#: g10/gpg.c:3650
+#: g10/gpg.c:3651
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "無效的自動金鑰定�清單\n"
 
-#: g10/gpg.c:3659
+#: g10/gpg.c:3660
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "�項 \"%.50s\" 的引數無效\n"
 
-#: g10/gpg.c:3847 sm/gpgsm.c:1544
+#: g10/gpg.c:3848 sm/gpgsm.c:1563
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程��能會傾�出核心檔!\n"
 
-#: g10/gpg.c:3856
+#: g10/gpg.c:3857
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會推翻 %s\n"
 
-#: g10/gpg.c:3865
+#: g10/gpg.c:3866
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ��許跟 %s 併用!\n"
 
-#: g10/gpg.c:3868
+#: g10/gpg.c:3869
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有�義!\n"
 
-#: g10/gpg.c:3883 sm/gpgsm.c:1565 dirmngr/dirmngr.c:1204
+#: g10/gpg.c:3884 sm/gpgsm.c:1584 dirmngr/dirmngr.c:1204
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "警告: 正在�造的系統時間中執行: "
 
-#: g10/gpg.c:3904
+#: g10/gpg.c:3905
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而�會在�安全的記憶體中執行\n"
 
-#: g10/gpg.c:3942 g10/gpg.c:3973 sm/gpgsm.c:1633
+#: g10/gpg.c:3943 g10/gpg.c:3974 sm/gpgsm.c:1654
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所�的編密演算法無效\n"
 
-#: g10/gpg.c:3949
+#: g10/gpg.c:3950
 #, fuzzy, c-format
 #| msgid "selected digest algorithm is invalid\n"
 msgid "selected AEAD algorithm is invalid\n"
 msgstr "所�的摘�演算法無效\n"
 
-#: g10/gpg.c:3961
+#: g10/gpg.c:3962
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "所�的壓縮演算法無效\n"
 
-#: g10/gpg.c:3967
+#: g10/gpg.c:3968
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所�的憑證摘�演算法無效\n"
 
-#: g10/gpg.c:3982
+#: g10/gpg.c:3983
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定�大於 0\n"
 
-#: g10/gpg.c:3984
+#: g10/gpg.c:3985
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定�大於 1\n"
 
-#: g10/gpg.c:3986
+#: g10/gpg.c:3987
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定�介於 1 和 255 之間\n"
 
-#: g10/gpg.c:3988
+#: g10/gpg.c:3989
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "無效的 default-cert-level; 一定�是 0, 1, 2 或 3\n"
 
-#: g10/gpg.c:3990
+#: g10/gpg.c:3991
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定�是 1, 2 或 3\n"
 
-#: g10/gpg.c:3994
+#: g10/gpg.c:3995
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注�: 強烈�建議使用單純 S2K 模� (0)\n"
 
-#: g10/gpg.c:3998
+#: g10/gpg.c:3999
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模�; 一定�是 0, 1 或 3\n"
 
-#: g10/gpg.c:4005
+#: g10/gpg.c:4006
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "無效的�設�好\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4010
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法�好\n"
 
-#: g10/gpg.c:4012
+#: g10/gpg.c:4013
 #, fuzzy, c-format
 #| msgid "invalid personal cipher preferences\n"
 msgid "invalid personal AEAD preferences\n"
 msgstr "無效的個人編密法�好\n"
 
-#: g10/gpg.c:4016
+#: g10/gpg.c:4017
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘��好\n"
 
-#: g10/gpg.c:4020
+#: g10/gpg.c:4021
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮�好\n"
 
-#: g10/gpg.c:4029 g10/gpg.c:4034
+#: g10/gpg.c:4030 g10/gpg.c:4035
 #, fuzzy, c-format
 #| msgid "keysize invalid; using %u bits\n"
 msgid "chunk size invalid - using %d\n"
 msgstr "金鑰尺寸無效; 改用 %u �元\n"
 
-#: g10/gpg.c:4071
+#: g10/gpg.c:4072
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起�作\n"
 
-#: g10/gpg.c:4134
+#: g10/gpg.c:4135
 #, fuzzy, c-format
 #| msgid "you may not use cipher algorithm '%s' while in %s mode\n"
 msgid "AEAD algorithm '%s' may not be used in %s mode\n"
 msgstr "你�該將 '%s' 編密演算法用於 %s 模�\n"
 
-#: g10/gpg.c:4146
+#: g10/gpg.c:4147
 #, fuzzy, c-format
 #| msgid "you may not use compression algorithm '%s' while in %s mode\n"
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "你�該將 '%s' 壓縮演算法用於 %s 模�\n"
 
-#: g10/gpg.c:4301
+#: g10/gpg.c:4302
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:4313
+#: g10/gpg.c:4314
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:4385
+#: g10/gpg.c:4386
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "'%s' �稱�加密失敗: %s\n"
 
-#: g10/gpg.c:4414
+#: g10/gpg.c:4415
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "你�能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:4417
+#: g10/gpg.c:4418
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "你�能在 %s 模�中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:4475
+#: g10/gpg.c:4476
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "你�能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:4478
+#: g10/gpg.c:4479
 #, fuzzy, c-format
 #| msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "你�能在 %s 模�中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:4878 g10/keyserver.c:1629
+#: g10/gpg.c:4879 g10/keyserver.c:1631
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�至金鑰伺�器失敗: %s\n"
 
-#: g10/gpg.c:4883
+#: g10/gpg.c:4884
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺�器接收失敗: %s\n"
 
-#: g10/gpg.c:4889
+#: g10/gpg.c:4890
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:4902 g10/gpg.c:4913
+#: g10/gpg.c:4903 g10/gpg.c:4914
 #, fuzzy, c-format
 #| msgid "key export failed: %s\n"
 msgid "export as ssh key failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:4925
+#: g10/gpg.c:4926
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "用金鑰伺�器�尋失敗: %s\n"
 
-#: g10/gpg.c:4938
+#: g10/gpg.c:4939
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺�器更新失敗: %s\n"
 
-#: g10/gpg.c:5007
+#: g10/gpg.c:5008
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開��失敗: %s\n"
 
-#: g10/gpg.c:5018
+#: g10/gpg.c:5019
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行��失敗: %s\n"
 
-#: g10/gpg.c:5123
+#: g10/gpg.c:5145
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "無效的雜湊演算法 '%s'\n"
 
-#: g10/gpg.c:5275 g10/tofu.c:2160
+#: g10/gpg.c:5297 g10/tofu.c:2160
 #, fuzzy, c-format
 #| msgid "error loading certificate '%s': %s\n"
 msgid "error parsing key specification '%s': %s\n"
 msgstr "載入憑證 '%s' 時出錯: %s\n"
 
-#: g10/gpg.c:5286
+#: g10/gpg.c:5308
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr ""
 
-#: g10/gpg.c:5342
+#: g10/gpg.c:5364
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr ""
 
-#: g10/gpg.c:5353
+#: g10/gpg.c:5375
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始輸入你的訊� ...\n"
 
-#: g10/gpg.c:5700
+#: g10/gpg.c:5722
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:5702
+#: g10/gpg.c:5724
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:5735
+#: g10/gpg.c:5757
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的�好金鑰伺�器 URL 無效\n"
@@ -3479,7 +3488,7 @@ msgstr "|檔案|從指定鑰匙圈檔案裡�用金鑰"
 msgid "make timestamp conflicts only a warning"
 msgstr "僅把時間戳�矛盾視為警告"
 
-#: g10/gpgv.c:86 sm/gpgsm.c:420 tools/gpgconf.c:122 tools/gpg-card.c:95
+#: g10/gpgv.c:86 sm/gpgsm.c:421 tools/gpgconf.c:122 tools/gpg-card.c:95
 msgid "|FD|write status info to this FD"
 msgstr "|檔案�述|把狀態資訊寫入此指定檔案�述"
 
@@ -4205,7 +4214,7 @@ msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "你�然想�簽署它嗎? (y/N) "
 
 #: g10/keyedit.c:583 g10/keyedit.c:611 g10/keyedit.c:638 g10/keyedit.c:815
-#: g10/keyedit.c:1666 g10/keyedit.c:2703
+#: g10/keyedit.c:1666 g10/keyedit.c:2759
 msgid "  Unable to sign.\n"
 msgstr "  無法簽署.\n"
 
@@ -4377,8 +4386,8 @@ msgstr "我�常�心地檢查�這把金鑰了.\n"
 msgid "Really sign? (y/N) "
 msgstr "真的�簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1032 g10/keyedit.c:6200 g10/keyedit.c:6283 g10/keyedit.c:6412
-#: g10/keyedit.c:6474 g10/sign.c:535
+#: g10/keyedit.c:1032 g10/keyedit.c:6256 g10/keyedit.c:6339 g10/keyedit.c:6468
+#: g10/keyedit.c:6530 g10/sign.c:535
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗: %s\n"
@@ -4575,7 +4584,7 @@ msgstr ""
 "  加上 't' 的話就是信任簽章 (tsign), 加上 'nr' 的話就是��撤銷簽章\n"
 "  (nrsign), 當然也�以任�組�這些�項 (�是 ltsign, tnrsign 等等.).\n"
 
-#: g10/keyedit.c:1654 g10/keyedit.c:2703 g10/keyedit.c:3076 g10/keyedit.c:3144
+#: g10/keyedit.c:1654 g10/keyedit.c:2759 g10/keyedit.c:3132 g10/keyedit.c:3200
 msgid "Key is revoked."
 msgstr "金鑰已撤銷."
 
@@ -4625,7 +4634,7 @@ msgstr "真的�移除這個使用者 ID 嗎? (y/N) "
 msgid "Really move the primary key? (y/N) "
 msgstr "真的�移動主鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4841
+#: g10/keyedit.c:1825 g10/keyedit.c:1865 g10/keyedit.c:4897
 msgid "You must select exactly one key.\n"
 msgstr "你一定祇得�擇一把金鑰.\n"
 
@@ -4699,171 +4708,171 @@ msgstr "�儲存變更嗎? (y/N) "
 msgid "Quit without saving? (y/N) "
 msgstr "��儲存就離開嗎? (y/N) "
 
-#: g10/keyedit.c:2263 g10/keyedit.c:2798 g10/keyedit.c:3097 g10/keyedit.c:3249
+#: g10/keyedit.c:2263 g10/keyedit.c:2854 g10/keyedit.c:3153 g10/keyedit.c:3305
 #, c-format
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以�需�更新.\n"
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2553
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "cannot revoke the last valid user ID.\n"
 msgstr "你�能刪除最後一個使用者 ID!\n"
 
-#: g10/keyedit.c:2523
+#: g10/keyedit.c:2579
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "revoking the user ID failed: %s\n"
 msgstr "檢查信任清單時失敗: %s\n"
 
-#: g10/keyedit.c:2589
+#: g10/keyedit.c:2645
 #, fuzzy, c-format
 #| msgid "checking the trust list failed: %s\n"
 msgid "setting the primary user ID failed: %s\n"
 msgstr "檢查信任清單時失敗: %s\n"
 
-#: g10/keyedit.c:2618
+#: g10/keyedit.c:2674
 #, c-format
 msgid "\"%s\" is not a fingerprint\n"
 msgstr "\"%s\" �是指紋\n"
 
-#: g10/keyedit.c:2638
+#: g10/keyedit.c:2694
 #, c-format
 msgid "\"%s\" is not the primary fingerprint\n"
 msgstr "\"%s\" �是主�指紋\n"
 
-#: g10/keyedit.c:2774 g10/keyedit.c:2777
+#: g10/keyedit.c:2830 g10/keyedit.c:2833
 #, fuzzy, c-format
 #| msgid "invalid value\n"
 msgid "Invalid user ID '%s': %s\n"
 msgstr "無效的數值\n"
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "No matching user IDs."
 msgstr "沒有相符的使用者 ID."
 
-#: g10/keyedit.c:2780
+#: g10/keyedit.c:2836
 msgid "Nothing to sign.\n"
 msgstr "沒有�西�以簽署.\n"
 
-#: g10/keyedit.c:2973 g10/keyedit.c:6065
+#: g10/keyedit.c:3029 g10/keyedit.c:6121
 #, c-format
 msgid "Not signed by you.\n"
 msgstr "並�由你所簽署.\n"
 
-#: g10/keyedit.c:3031
+#: g10/keyedit.c:3087
 #, fuzzy, c-format
 #| msgid "checking created signature failed: %s\n"
 msgid "revoking the key signature failed: %s\n"
 msgstr "檢查已建立的簽章時出錯: %s\n"
 
-#: g10/keyedit.c:3152
+#: g10/keyedit.c:3208
 #, fuzzy, c-format
 #| msgid "'%s' is not a valid signature expiration\n"
 msgid "'%s' is not a valid expiration time\n"
 msgstr "'%s' �是有效的簽章使用期�\n"
 
-#: g10/keyedit.c:3194
+#: g10/keyedit.c:3250
 #, fuzzy, c-format
 #| msgid "\"%s\" is not a fingerprint\n"
 msgid "\"%s\" is not a proper fingerprint\n"
 msgstr "\"%s\" �是指紋\n"
 
-#: g10/keyedit.c:3218
+#: g10/keyedit.c:3274
 #, fuzzy, c-format
 #| msgid "key \"%s\" not found: %s\n"
 msgid "subkey \"%s\" not found\n"
 msgstr "找�到金鑰 \"%s\": %s\n"
 
-#: g10/keyedit.c:3341
+#: g10/keyedit.c:3397
 msgid "AEAD: "
 msgstr ""
 
-#: g10/keyedit.c:3358
+#: g10/keyedit.c:3414
 msgid "Digest: "
 msgstr "摘�: "
 
-#: g10/keyedit.c:3415
+#: g10/keyedit.c:3471
 msgid "Features: "
 msgstr "特點: "
 
-#: g10/keyedit.c:3432
+#: g10/keyedit.c:3488
 msgid "Keyserver no-modify"
 msgstr "金鑰伺�器無修改"
 
-#: g10/keyedit.c:3447 g10/keylist.c:392
+#: g10/keyedit.c:3503 g10/keylist.c:392
 msgid "Preferred keyserver: "
 msgstr "�好的金鑰伺�器: "
 
-#: g10/keyedit.c:3455 g10/keyedit.c:3456
+#: g10/keyedit.c:3511 g10/keyedit.c:3512
 msgid "Notations: "
 msgstr "註記: "
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3762
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 型態的使用者 ID 沒有�好設定.\n"
 
-#: g10/keyedit.c:3778
+#: g10/keyedit.c:3834
 #, c-format
 msgid "The following key was revoked on %s by %s key %s\n"
 msgstr "下列金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
 
-#: g10/keyedit.c:3802
+#: g10/keyedit.c:3858
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "這把金鑰�能被 %s 金鑰 %s 所撤銷"
 
-#: g10/keyedit.c:3808
+#: g10/keyedit.c:3864
 msgid "(sensitive)"
 msgstr "(機密)"
 
-#: g10/keyedit.c:3850 g10/keyedit.c:3997 g10/keylist.c:283 g10/keyserver.c:348
+#: g10/keyedit.c:3906 g10/keyedit.c:4053 g10/keylist.c:283 g10/keyserver.c:348
 #, c-format
 msgid "created: %s"
 msgstr "建立: %s"
 
-#: g10/keyedit.c:3853 g10/keylist.c:2254
+#: g10/keyedit.c:3909 g10/keylist.c:2254
 #, c-format
 msgid "revoked: %s"
 msgstr "撤銷: %s"
 
 #  of subkey
-#: g10/keyedit.c:3855 g10/keylist.c:2260
+#: g10/keyedit.c:3911 g10/keylist.c:2260
 #, c-format
 msgid "expired: %s"
 msgstr "�期: %s"
 
 #  of subkey
-#: g10/keyedit.c:3857 g10/keyedit.c:3999 g10/keylist.c:285 g10/keylist.c:2266
+#: g10/keyedit.c:3913 g10/keyedit.c:4055 g10/keylist.c:285 g10/keylist.c:2266
 #: g10/keyserver.c:354
 #, c-format
 msgid "expires: %s"
 msgstr "到期: %s"
 
-#: g10/keyedit.c:3859
+#: g10/keyedit.c:3915
 #, c-format
 msgid "usage: %s"
 msgstr "用途: %s"
 
-#: g10/keyedit.c:3867 g10/keyedit.c:3887 g10/keylist.c:288
+#: g10/keyedit.c:3923 g10/keyedit.c:3943 g10/keylist.c:288
 msgid "card-no: "
 msgstr "�片編號: "
 
-#: g10/keyedit.c:3926
+#: g10/keyedit.c:3982
 #, c-format
 msgid "trust: %s"
 msgstr "ä¿¡ä»»: %s"
 
-#: g10/keyedit.c:3930
+#: g10/keyedit.c:3986
 #, c-format
 msgid "validity: %s"
 msgstr "有效性: %s"
 
-#: g10/keyedit.c:3937
+#: g10/keyedit.c:3993
 msgid "This key has been disabled"
 msgstr "這把金鑰已經�用了"
 
-#: g10/keyedit.c:3955
+#: g10/keyedit.c:4011
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4871,17 +4880,17 @@ msgstr ""
 "請注�顯示出來的金鑰有效性�需�更正,\n"
 "除�你�新執行程�.\n"
 
-#: g10/keyedit.c:4016 g10/keyedit.c:4447 g10/keyserver.c:358
-#: g10/mainproc.c:2319 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
+#: g10/keyedit.c:4072 g10/keyedit.c:4503 g10/keyserver.c:358
+#: g10/mainproc.c:2331 g10/tofu.c:1789 g10/trust.c:430 dirmngr/ocsp.c:846
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:4018 g10/keyedit.c:4449 g10/keyserver.c:362
-#: g10/mainproc.c:2321 g10/tofu.c:1794 g10/trust.c:113
+#: g10/keyedit.c:4074 g10/keyedit.c:4505 g10/keyserver.c:362
+#: g10/mainproc.c:2333 g10/tofu.c:1794 g10/trust.c:113
 msgid "expired"
 msgstr "已�期"
 
-#: g10/keyedit.c:4135
+#: g10/keyedit.c:4191
 #, c-format
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
@@ -4890,17 +4899,17 @@ msgstr ""
 "警告: 沒有任何使用者 ID 被標示為主� ID. 這項指令�能會\n"
 "      導致��的使用者 ID 被當�主� ID.\n"
 
-#: g10/keyedit.c:4187
+#: g10/keyedit.c:4243
 #, c-format
 msgid "WARNING: Your encryption subkey expires soon.\n"
 msgstr "警告: 你的加密�鑰很快將到期.\n"
 
-#: g10/keyedit.c:4188
+#: g10/keyedit.c:4244
 #, c-format
 msgid "You may want to change its expiration date too.\n"
 msgstr "你�能也會想變更其使用期�.\n"
 
-#: g10/keyedit.c:4247
+#: g10/keyedit.c:4303
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4909,72 +4918,74 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID �能會導致�些版本的 PGP �回這把金鑰.\n"
 
-#: g10/keyedit.c:4252 g10/keyedit.c:4542
+#: g10/keyedit.c:4308 g10/keyedit.c:4598
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "你確定�然想�增加嗎? (y/N) "
 
-#: g10/keyedit.c:4258
+#: g10/keyedit.c:4314
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "你��以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:4273 g10/keygen.c:3102
-msgid "Such a user ID already exists on this key!\n"
+#: g10/keyedit.c:4329
+#, fuzzy
+#| msgid "Such a user ID already exists on this key!\n"
+msgid "Such a user ID already exists on this key!"
 msgstr "這把金鑰上已經有這樣�的使用者 ID 了!\n"
 
-#: g10/keyedit.c:4375
+#: g10/keyedit.c:4431
 msgid "Delete this good signature? (y/N/q)"
 msgstr "刪除這份完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:4385
+#: g10/keyedit.c:4441
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "刪除這份無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:4389
+#: g10/keyedit.c:4445
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "刪除這份未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:4396
+#: g10/keyedit.c:4452
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的�刪除這份自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:4412
+#: g10/keyedit.c:4468
 #, 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:4416
+#: g10/keyedit.c:4472
 msgid "Nothing deleted.\n"
 msgstr "沒有刪除任何�西.\n"
 
-#: g10/keyedit.c:4451
+#: g10/keyedit.c:4507
 msgid "invalid"
 msgstr "無效"
 
-#: g10/keyedit.c:4453
+#: g10/keyedit.c:4509
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "使用者 ID \"%s\" 已精簡: %s\n"
 
-#: g10/keyedit.c:4459
+#: g10/keyedit.c:4515
 #, 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:4467
+#: g10/keyedit.c:4523
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "使用者 ID \"%s\": 已經最�化了\n"
 
-#: g10/keyedit.c:4468
+#: g10/keyedit.c:4524
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
 
-#: g10/keyedit.c:4537
+#: g10/keyedit.c:4593
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4983,15 +4994,15 @@ msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加指定撤銷者�能會導致�些版本的 PGP �回這把金鑰.\n"
 
-#: g10/keyedit.c:4548
+#: g10/keyedit.c:4604
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "你��以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:4565
+#: g10/keyedit.c:4621
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:4591
+#: g10/keyedit.c:4647
 #, c-format
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
@@ -4999,26 +5010,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:4607
+#: g10/keyedit.c:4663
 #, c-format
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "你�能指派�把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:4629
+#: g10/keyedit.c:4685
 #, c-format
 msgid "this key has already been designated as a revoker\n"
 msgstr "已指定這把金鑰為撤銷者了\n"
 
-#: g10/keyedit.c:4647
+#: g10/keyedit.c:4703
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把�把金鑰指派為指定撤銷者後, 就無法�悔了!\n"
 
-#: g10/keyedit.c:4653
+#: g10/keyedit.c:4709
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "你確定�指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:4721
+#: g10/keyedit.c:4777
 #, fuzzy
 #| msgid ""
 #| "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -5027,177 +5038,177 @@ msgid ""
 "N) "
 msgstr "你確定�指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:4726
+#: g10/keyedit.c:4782
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更�鑰的使用期�.\n"
 
-#: g10/keyedit.c:4729
+#: g10/keyedit.c:4785
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期�.\n"
 
-#: g10/keyedit.c:4785
+#: g10/keyedit.c:4841
 #, c-format
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "你�能變更 v3 金鑰的使用期�\n"
 
-#: g10/keyedit.c:4845
+#: g10/keyedit.c:4901
 #, fuzzy
 #| msgid "Changing expiration time for a subkey.\n"
 msgid "Changing usage of a subkey.\n"
 msgstr "正在變更�鑰的使用期�.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4904
 #, fuzzy
 #| msgid "Changing expiration time for the primary key.\n"
 msgid "Changing usage of the primary key.\n"
 msgstr "正在變更主鑰的使用期�.\n"
 
-#: g10/keyedit.c:4966
+#: g10/keyedit.c:5022
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "簽署�鑰 %s 已經交��證�了\n"
 
-#: g10/keyedit.c:4972
+#: g10/keyedit.c:5028
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "�鑰 %s ��簽署之用, 因此無須交�驗證\n"
 
-#: g10/keyedit.c:5089
+#: g10/keyedit.c:5145
 msgid "Please select exactly one user ID.\n"
 msgstr "請祇�擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:5130 g10/keyedit.c:5244 g10/keyedit.c:5360 g10/keyedit.c:5503
+#: g10/keyedit.c:5186 g10/keyedit.c:5300 g10/keyedit.c:5416 g10/keyedit.c:5559
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳�使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:5301
+#: g10/keyedit.c:5357
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入你的�好金鑰伺�器 URL: "
 
-#: g10/keyedit.c:5383
+#: g10/keyedit.c:5439
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "你確定��代它嗎？ (y/N) "
 
-#: g10/keyedit.c:5384
+#: g10/keyedit.c:5440
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "你確定�刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:5449
+#: g10/keyedit.c:5505
 msgid "Enter the notation: "
 msgstr "請輸入註記: "
 
-#: g10/keyedit.c:5596
+#: g10/keyedit.c:5652
 msgid "Proceed? (y/N) "
 msgstr "是�繼續? (y/N) "
 
-#: g10/keyedit.c:5666
+#: g10/keyedit.c:5722
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有�應到使用者 ID\n"
 
-#: g10/keyedit.c:5728
+#: g10/keyedit.c:5784
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有�應到使用者 ID\n"
 
-#: g10/keyedit.c:5829
+#: g10/keyedit.c:5885
 #, fuzzy, c-format
 #| msgid "No subkey with index %d\n"
 msgid "No subkey with key ID '%s'.\n"
 msgstr "索引 %d 沒有�應到�鑰\n"
 
-#: g10/keyedit.c:5851
+#: g10/keyedit.c:5907
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有�應到�鑰\n"
 
-#: g10/keyedit.c:5992
+#: g10/keyedit.c:6048
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:5995 g10/keyedit.c:6097 g10/keyedit.c:6145
+#: g10/keyedit.c:6051 g10/keyedit.c:6153 g10/keyedit.c:6201
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
 
-#: g10/keyedit.c:5997 g10/keyedit.c:6099 g10/keyedit.c:6147
+#: g10/keyedit.c:6053 g10/keyedit.c:6155 g10/keyedit.c:6203
 msgid " (non-exportable)"
 msgstr " (��匯出)"
 
-#: g10/keyedit.c:6001
+#: g10/keyedit.c:6057
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽章已經在 %s �期了.\n"
 
-#: g10/keyedit.c:6006
+#: g10/keyedit.c:6062
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "你確定�然想�撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:6011
+#: g10/keyedit.c:6067
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:6071
+#: g10/keyedit.c:6127
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:6100
+#: g10/keyedit.c:6156
 msgid " (non-revocable)"
 msgstr " (��撤銷)"
 
-#: g10/keyedit.c:6107
+#: g10/keyedit.c:6163
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:6132
+#: g10/keyedit.c:6188
 msgid "You are about to revoke these signatures:\n"
 msgstr "你正�撤銷這些簽章:\n"
 
-#: g10/keyedit.c:6155
+#: g10/keyedit.c:6211
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的�建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:6188
+#: g10/keyedit.c:6244
 #, c-format
 msgid "no secret key\n"
 msgstr "沒有�鑰\n"
 
-#: g10/keyedit.c:6236
+#: g10/keyedit.c:6292
 #, c-format
 msgid "tried to revoke a non-user ID: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:6246
+#: g10/keyedit.c:6302
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已撤銷\n"
 
-#: g10/keyedit.c:6263
+#: g10/keyedit.c:6319
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:6359
+#: g10/keyedit.c:6415
 #, fuzzy, c-format
 #| msgid "You can't delete the last user ID!\n"
 msgid "Cannot revoke the last valid user ID.\n"
 msgstr "你�能刪除最後一個使用者 ID!\n"
 
-#: g10/keyedit.c:6397
+#: g10/keyedit.c:6453
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:6459
+#: g10/keyedit.c:6515
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:6556
+#: g10/keyedit.c:6612
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
@@ -5623,6 +5634,10 @@ msgstr ""
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "請��把電�郵件地�放進你的真實姓�或註釋裡\n"
 
+#: g10/keygen.c:3102
+msgid "Such a user ID already exists on this key!\n"
+msgstr "這把金鑰上已經有這樣�的使用者 ID 了!\n"
+
 #. TRANSLATORS: These are the allowed answers in
 #. lower and uppercase.  Below you will find the matching
 #. string which should be translated accordingly and the
@@ -5936,55 +5951,55 @@ msgstr "無效的金鑰伺�器�定 (我們用 %d!=經手程� %d)\n"
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" 並�金鑰 ID: 跳�中\n"
 
-#: g10/keyserver.c:1217 g10/keyserver.c:1250
+#: g10/keyserver.c:1217 g10/keyserver.c:1252
 #, fuzzy, c-format
 #| msgid "refreshing %d keys from %s\n"
 msgid "refreshing %d key from %s\n"
 msgid_plural "refreshing %d keys from %s\n"
 msgstr[0] "更新 %d 份金鑰中 (從 %s )\n"
 
-#: g10/keyserver.c:1224
+#: g10/keyserver.c:1226
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1316
+#: g10/keyserver.c:1318
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在金鑰伺�器上找�到金鑰 \"%s\"\n"
 
-#: g10/keyserver.c:1319
+#: g10/keyserver.c:1321
 #, c-format
 msgid "key not found on keyserver\n"
 msgstr "在金鑰伺�器上找�到金鑰\n"
 
-#: g10/keyserver.c:1481
+#: g10/keyserver.c:1483
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "正在請求金鑰 %s 自 %s\n"
 
-#: g10/keyserver.c:1600 g10/keyserver.c:1793
+#: g10/keyserver.c:1602 g10/keyserver.c:1795
 #, fuzzy, c-format
 #| msgid "invalid keyserver options\n"
 msgid "no keyserver known\n"
 msgstr "無效的金鑰伺�器�項\n"
 
-#: g10/keyserver.c:1615 g10/skclist.c:214 g10/skclist.c:242
+#: g10/keyserver.c:1617 g10/skclist.c:214 g10/skclist.c:242
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "已跳� \"%s\": %s\n"
 
-#: g10/keyserver.c:1619
+#: g10/keyserver.c:1621
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "��金鑰 %s 至 %s\n"
 
-#: g10/keyserver.c:1662
+#: g10/keyserver.c:1664
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "正在� '%s' 請求金鑰\n"
 
-#: g10/keyserver.c:1680
+#: g10/keyserver.c:1682
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告: 無法抓� URI %s: %s\n"
@@ -6017,249 +6032,249 @@ msgstr "以 %d 未知演算法所加密\n"
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密語係以未知的 %d 摘�演算法所產生\n"
 
-#: g10/mainproc.c:475
+#: g10/mainproc.c:480
 #, c-format
 msgid "public key is %s\n"
 msgstr "公鑰為 %s\n"
 
-#: g10/mainproc.c:527
+#: g10/mainproc.c:532
 #, fuzzy, c-format
 #| msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgid "encrypted with %s key, ID %s, created %s\n"
 msgstr "已用 %u �元長的 %s 金鑰,  ID %s, 建立於 %s 所加密\n"
 
-#: g10/mainproc.c:531 g10/pkclist.c:231
+#: g10/mainproc.c:536 g10/pkclist.c:231
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:535
+#: g10/mainproc.c:540
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "已用 %s 金鑰, ID %s 所加密\n"
 
-#: g10/mainproc.c:558 g10/mainproc.c:974
+#: g10/mainproc.c:563 g10/mainproc.c:986
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "警告: 看到了多份明文\n"
 
-#: g10/mainproc.c:566
+#: g10/mainproc.c:571
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "已用 %lu 個密語加密了\n"
 
-#: g10/mainproc.c:568
+#: g10/mainproc.c:573
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:583 g10/mainproc.c:608
+#: g10/mainproc.c:588 g10/mainproc.c:613
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公鑰解密失敗: %s\n"
 
-#: g10/mainproc.c:619
+#: g10/mainproc.c:624
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "公鑰加密�的資料: 完好的 DEK\n"
 
-#: g10/mainproc.c:648 g10/mainproc.c:669
+#: g10/mainproc.c:653 g10/mainproc.c:674
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "�定 %s 為加密�的資料\n"
 
-#: g10/mainproc.c:655
+#: g10/mainproc.c:660
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 編密法��用, 我們樂觀地試著改以 %s 代替\n"
 
-#: g10/mainproc.c:752 g10/mainproc.c:796
+#: g10/mainproc.c:757 g10/mainproc.c:801
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告: 訊�未�到完整的�護\n"
 
-#: g10/mainproc.c:763
+#: g10/mainproc.c:768
 msgid ""
 "Hint: If this message was created before the year 2003 it is\n"
 "likely that this message is legitimate.  This is because back\n"
 "then integrity protection was not widely used.\n"
 msgstr ""
 
-#: g10/mainproc.c:766
+#: g10/mainproc.c:771
 #, c-format
 msgid "Use the option '%s' to decrypt anyway.\n"
 msgstr ""
 
-#: g10/mainproc.c:771
+#: g10/mainproc.c:776
 #, fuzzy, c-format
 #| msgid "decryption failed: %s\n"
 msgid "decryption forced to fail!\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:783
+#: g10/mainproc.c:788
 #, c-format
 msgid "decryption okay\n"
 msgstr "解密�功\n"
 
-#: g10/mainproc.c:802
+#: g10/mainproc.c:807
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告: 加密�的訊�已經被變造了!\n"
 
-#: g10/mainproc.c:820
+#: g10/mainproc.c:832
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:890
+#: g10/mainproc.c:902
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "請注�: 寄件者�求了 \"�准你用眼�看\"\n"
 
-#: g10/mainproc.c:897
+#: g10/mainproc.c:909
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始的檔� ='%.*s'\n"
 
-#: g10/mainproc.c:1174
+#: g10/mainproc.c:1186
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "�立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
-#: g10/mainproc.c:1479 g10/mainproc.c:1522
+#: g10/mainproc.c:1491 g10/mainproc.c:1534
 #, c-format
 msgid "no signature found\n"
 msgstr "找�到簽章\n"
 
-#: g10/mainproc.c:1802
+#: g10/mainproc.c:1814
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*�壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1804
+#: g10/mainproc.c:1816
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "�期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1806
+#: g10/mainproc.c:1818
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1828
+#: g10/mainproc.c:1840
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "簽章驗證已抑制\n"
 
-#: g10/mainproc.c:1942
+#: g10/mainproc.c:1954
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "無法處�這個�明確的簽章資料\n"
 
-#: g10/mainproc.c:1958 g10/mainproc.c:1965
+#: g10/mainproc.c:1970 g10/mainproc.c:1977
 #, c-format
 msgid "Signature made %s\n"
 msgstr "由 %s 建立的簽章\n"
 
-#: g10/mainproc.c:1959 g10/mainproc.c:1966 sm/verify.c:480
+#: g10/mainproc.c:1971 g10/mainproc.c:1978 sm/verify.c:480
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               使用 %s 金鑰 %s\n"
 
-#: g10/mainproc.c:1970
+#: g10/mainproc.c:1982
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 
-#: g10/mainproc.c:1976
+#: g10/mainproc.c:1988
 #, fuzzy, c-format
 #| msgid "                aka \"%s\""
 msgid "               issuer \"%s\"\n"
 msgstr "                亦� \"%s\""
 
-#: g10/mainproc.c:2031
+#: g10/mainproc.c:2043
 #, c-format
 msgid "Key available at: "
 msgstr "�用的金鑰於: "
 
-#: g10/mainproc.c:2073
+#: g10/mainproc.c:2085
 #, c-format
 msgid "Note: Use '%s' to make use of this info\n"
 msgstr ""
 
-#: g10/mainproc.c:2273
+#: g10/mainproc.c:2285
 msgid "[uncertain]"
 msgstr "[ �確定 ]"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2323
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦� \"%s\""
 
-#: g10/mainproc.c:2386
+#: g10/mainproc.c:2398
 #, fuzzy, c-format
 #| msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "警告: 這把金鑰並�以�信任的簽章所�證!\n"
 
-#: g10/mainproc.c:2402
+#: g10/mainproc.c:2414
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "這份簽署已經在 %s �期了\n"
 
-#: g10/mainproc.c:2407
+#: g10/mainproc.c:2419
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "這份簽署將在 %s 到期\n"
 
-#: g10/mainproc.c:2418
+#: g10/mainproc.c:2430
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s 簽章, 摘�演算法 %s%s%s\n"
 
-#: g10/mainproc.c:2419
+#: g10/mainproc.c:2431
 msgid "binary"
 msgstr "二進制"
 
-#: g10/mainproc.c:2420
+#: g10/mainproc.c:2432
 msgid "textmode"
 msgstr "文字模�"
 
-#: g10/mainproc.c:2420 g10/trust.c:112 dirmngr/ocsp.c:847
+#: g10/mainproc.c:2432 g10/trust.c:112 dirmngr/ocsp.c:847
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:2422
+#: g10/mainproc.c:2434
 msgid ", key algorithm "
 msgstr ", 金鑰演算法 "
 
-#: g10/mainproc.c:2457
+#: g10/mainproc.c:2469
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr ""
 
-#: g10/mainproc.c:2505
+#: g10/mainproc.c:2517
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:2601 g10/mainproc.c:2620 g10/mainproc.c:2744
+#: g10/mainproc.c:2613 g10/mainproc.c:2632 g10/mainproc.c:2756
 #, c-format
 msgid "not a detached signature\n"
 msgstr "�是一份分離的簽章\n"
 
-#: g10/mainproc.c:2654
+#: g10/mainproc.c:2666
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: �測到多�簽章. 祇有第一個簽章纔會被核�.\n"
 
-#: g10/mainproc.c:2663
+#: g10/mainproc.c:2675
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等級 0x%02x 的�立簽章\n"
 
-#: g10/mainproc.c:2748
+#: g10/mainproc.c:2760
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "舊型 (PGP 2.x) 簽章\n"
@@ -6332,11 +6347,6 @@ msgstr ""
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: �建議使用的�項 \"%s\"\n"
 
-#: g10/misc.c:1188
-#, c-format
-msgid "WARNING: \"%s\" is a deprecated option\n"
-msgstr "警告: 已�建議使用 \"%s\" �項\n"
-
 #: g10/misc.c:1190
 #, c-format
 msgid "please use \"%s%s\" instead\n"
@@ -7407,133 +7417,133 @@ msgstr "'%s' 讀�錯誤: %s\n"
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任資料庫: �步化失敗: %s\n"
 
-#: g10/tdbio.c:144
+#: g10/tdbio.c:137
 #, c-format
 msgid "can't create lock for '%s'\n"
 msgstr "無法為 '%s' 建立鎖定\n"
 
-#: g10/tdbio.c:149
+#: g10/tdbio.c:142
 #, c-format
 msgid "can't lock '%s'\n"
 msgstr "無法鎖定 '%s'\n"
 
-#: g10/tdbio.c:224 g10/tdbio.c:1855
+#: g10/tdbio.c:217 g10/tdbio.c:1825
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任資料庫記錄 %lu: 本機�尋失敗: %s\n"
 
-#: g10/tdbio.c:232 g10/tdbio.c:1866
+#: g10/tdbio.c:225 g10/tdbio.c:1836
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
 
-#: g10/tdbio.c:372
+#: g10/tdbio.c:365
 #, c-format
 msgid "trustdb transaction too large\n"
 msgstr "信任資料庫更動��大\n"
 
-#: g10/tdbio.c:718
+#: g10/tdbio.c:711
 #, c-format
 msgid "%s: directory does not exist!\n"
 msgstr "%s: 目錄�存在!\n"
 
-#: g10/tdbio.c:741 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:727 dirmngr/http.c:627 dirmngr/http.c:656
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "無法存� '%s': %s\n"
 
-#: g10/tdbio.c:762
+#: g10/tdbio.c:748
 #, c-format
 msgid "%s: failed to create version record: %s"
 msgstr "%s: 建立版本記錄失敗: %s"
 
-#: g10/tdbio.c:767
+#: g10/tdbio.c:753
 #, c-format
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: 建立了無效的信任資料庫\n"
 
-#: g10/tdbio.c:770
+#: g10/tdbio.c:756
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: 建立了信任資料庫\n"
 
-#: g10/tdbio.c:826
+#: g10/tdbio.c:796
 #, c-format
 msgid "Note: trustdb not writable\n"
 msgstr "請注�: 信任資料庫��寫入\n"
 
-#: g10/tdbio.c:835
+#: g10/tdbio.c:805
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: 無效的信任資料庫\n"
 
-#: g10/tdbio.c:872
+#: g10/tdbio.c:842
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: 建立雜湊表失敗: %s\n"
 
-#: g10/tdbio.c:880
+#: g10/tdbio.c:850
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: 更新版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:904 g10/tdbio.c:938 g10/tdbio.c:956 g10/tdbio.c:976
-#: g10/tdbio.c:1013 g10/tdbio.c:1785 g10/tdbio.c:1814
+#: g10/tdbio.c:874 g10/tdbio.c:908 g10/tdbio.c:926 g10/tdbio.c:946
+#: g10/tdbio.c:983 g10/tdbio.c:1755 g10/tdbio.c:1784
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: 讀�版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:985
+#: g10/tdbio.c:955
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: 寫入版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:1535
+#: g10/tdbio.c:1505
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "信任資料庫: 本機�尋失敗: %s\n"
 
-#: g10/tdbio.c:1546
+#: g10/tdbio.c:1516
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "信任資料庫: 讀�失敗 (n=%d): %s\n"
 
-#: g10/tdbio.c:1571
+#: g10/tdbio.c:1541
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: �是一個信任資料庫檔案\n"
 
-#: g10/tdbio.c:1596
+#: g10/tdbio.c:1566
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: 記錄編號為 %lu 的版本記錄\n"
 
-#: g10/tdbio.c:1602
+#: g10/tdbio.c:1572
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: 無效的檔案版本 %d\n"
 
-#: g10/tdbio.c:1821
+#: g10/tdbio.c:1791
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: 讀��用空間記錄時出錯: %s\n"
 
-#: g10/tdbio.c:1827
+#: g10/tdbio.c:1797
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: 寫入目錄記錄時出錯: %s\n"
 
-#: g10/tdbio.c:1836
+#: g10/tdbio.c:1806
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: 記錄歸零失敗: %s\n"
 
-#: g10/tdbio.c:1872
+#: g10/tdbio.c:1842
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: 附加記錄失敗: %s\n"
 
-#: g10/tdbio.c:1930
+#: g10/tdbio.c:1900
 #, c-format
 msgid "Error: The trustdb is corrupted.\n"
 msgstr "錯誤: 信任資料庫已毀�.\n"
@@ -8150,16 +8160,16 @@ 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:5066 scd/app-nks.c:1530
-#: scd/app-openpgp.c:2388
+#: scd/app-piv.c:1770 scd/app-p15.c:5128 scd/app-nks.c:1535
+#: scd/app-openpgp.c:2419
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr ""
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-piv.c:1787 scd/app-p15.c:5085 scd/app-nks.c:1549
-#: scd/app-openpgp.c:2404
+#: scd/app-piv.c:1787 scd/app-p15.c:5147 scd/app-nks.c:1554
+#: scd/app-openpgp.c:2435
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr ""
@@ -8200,10 +8210,10 @@ 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:1660 scd/app-openpgp.c:2671
-#: scd/app-openpgp.c:2695 scd/app-openpgp.c:2873 scd/app-openpgp.c:2895
-#: scd/app-openpgp.c:3076 scd/app-openpgp.c:3363 scd/app-openpgp.c:3410
-#: scd/app-openpgp.c:3548 scd/app-dinsig.c:302
+#: scd/app-piv.c:1888 scd/app-nks.c:1665 scd/app-openpgp.c:2702
+#: scd/app-openpgp.c:2726 scd/app-openpgp.c:2904 scd/app-openpgp.c:2926
+#: scd/app-openpgp.c:3107 scd/app-openpgp.c:3394 scd/app-openpgp.c:3441
+#: scd/app-openpgp.c:3579 scd/app-dinsig.c:302
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "收回個人識別碼 (PIN) 時傳回錯誤: %s\n"
@@ -8225,153 +8235,153 @@ msgstr "用於 CHV%d 的個人識別碼 (PIN) 太短; 長度最少�有 %d\n"
 msgid "PIN has invalid characters; only digits are allowed\n"
 msgstr ""
 
-#: scd/app-piv.c:2657 scd/app-openpgp.c:3619
+#: scd/app-piv.c:2657 scd/app-openpgp.c:3650
 #, c-format
 msgid "key already exists\n"
 msgstr "金鑰已存在\n"
 
-#: scd/app-piv.c:2662 scd/app-openpgp.c:3623
+#: scd/app-piv.c:2662 scd/app-openpgp.c:3654
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "既有的金鑰將被�代\n"
 
-#: scd/app-piv.c:2664 scd/app-openpgp.c:3625
+#: scd/app-piv.c:2664 scd/app-openpgp.c:3656
 #, c-format
 msgid "generating new key\n"
 msgstr "正在產生新的金鑰\n"
 
-#: scd/app-piv.c:2666 scd/app-openpgp.c:3627
+#: scd/app-piv.c:2666 scd/app-openpgp.c:3658
 #, c-format
 msgid "writing new key\n"
 msgstr "正在寫入新的金鑰\n"
 
-#: scd/app-piv.c:3082 scd/app-openpgp.c:4487 scd/app-openpgp.c:4762
+#: scd/app-piv.c:3082 scd/app-openpgp.c:4518 scd/app-openpgp.c:4793
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "存放金鑰失敗: %s\n"
 
-#: scd/app-piv.c:3108 scd/app-openpgp.c:1617
+#: scd/app-piv.c:3108 scd/app-openpgp.c:1618
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "回應中未包� RSA 系數\n"
 
-#: scd/app-piv.c:3116 scd/app-openpgp.c:1624
+#: scd/app-piv.c:3116 scd/app-openpgp.c:1625
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包� RSA 公用指數\n"
 
-#: scd/app-piv.c:3186 scd/app-openpgp.c:1734
+#: scd/app-piv.c:3186 scd/app-openpgp.c:1735
 #, fuzzy, c-format
 #| msgid "response does not contain the EC public point\n"
 msgid "response does not contain the EC public key\n"
 msgstr "回應中未包� EC 公用指數\n"
 
-#: scd/app-piv.c:3279 scd/app-openpgp.c:4938
+#: scd/app-piv.c:3279 scd/app-openpgp.c:4969
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "正在產生金鑰中, 請�候 ...\n"
 
-#: scd/app-piv.c:3294 scd/app-openpgp.c:4946
+#: scd/app-piv.c:3294 scd/app-openpgp.c:4977
 #, c-format
 msgid "generating key failed\n"
 msgstr "產生金鑰時失敗\n"
 
-#: scd/app-piv.c:3300 scd/app-openpgp.c:4952
+#: scd/app-piv.c:3300 scd/app-openpgp.c:4983
 #, fuzzy, c-format
 #| msgid "key generation completed (%d seconds)\n"
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "金鑰產生完畢 (%d 秒)\n"
 
-#: scd/app-piv.c:3311 scd/app-openpgp.c:1844 scd/app-openpgp.c:4961
+#: scd/app-piv.c:3311 scd/app-openpgp.c:1845 scd/app-openpgp.c:4992
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "回應中未包�公鑰資料\n"
 
-#: scd/app-p15.c:5164 scd/app-nks.c:2038
+#: scd/app-p15.c:5226 scd/app-nks.c:2094
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||請輸入金鑰的個人識別碼 (PIN) 以建立完善的簽章."
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-p15.c:5167 scd/app-openpgp.c:2820
+#: scd/app-p15.c:5229 scd/app-openpgp.c:2851
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|請輸入管�者 PIN"
 
-#: scd/app-p15.c:5169 scd/app-nks.c:2028
+#: scd/app-p15.c:5231 scd/app-nks.c:2084
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|P|請輸入標準金鑰的 PIN �設碼 (PUK)."
 
-#: scd/app-p15.c:5172 scd/app-nks.c:2019
+#: scd/app-p15.c:5234 scd/app-nks.c:2075
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||請輸入標準金鑰的個人識別碼 (PIN)."
 
-#: scd/app-nks.c:1468 scd/app-openpgp.c:4324
+#: scd/app-nks.c:1473 scd/app-openpgp.c:4355
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 模組缺�或者並� %d �元大\n"
 
-#: scd/app-nks.c:1476 scd/app-openpgp.c:4336
+#: scd/app-nks.c:1481 scd/app-openpgp.c:4367
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公用指數缺�或者大於 %d �元\n"
 
-#: scd/app-nks.c:1649
+#: scd/app-nks.c:1654
 #, fuzzy
 #| msgid "the NullPIN has not yet been changed\n"
 msgid "Note: PIN has not yet been enabled."
 msgstr "NullPIN 還沒有變更�\n"
 
-#: scd/app-nks.c:1696
+#: scd/app-nks.c:1701
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN 還沒有變更�\n"
 
-#: scd/app-nks.c:2018
+#: scd/app-nks.c:2074
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|請輸入標準金鑰將採用的新個人識別碼 (PIN)."
 
-#: scd/app-nks.c:2026
+#: scd/app-nks.c:2082
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|請輸入標準金鑰將採用的 PIN �設碼 (PUK)."
 
-#: scd/app-nks.c:2036
+#: scd/app-nks.c:2092
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|請輸入金鑰的新個人識別碼 (PIN) 以建立完善的簽章."
 
-#: scd/app-nks.c:2046
+#: scd/app-nks.c:2102
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr "|NP|請輸入金鑰的新 PIN �設碼 (PUK) 以建立完善的簽章."
 
-#: scd/app-nks.c:2048
+#: scd/app-nks.c:2104
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr "|P|請輸入金鑰的 PIN �設碼 (PUK) 以建立完善的簽章."
 
-#: scd/app-nks.c:2221 scd/app-openpgp.c:3444 scd/app-dinsig.c:534
+#: scd/app-nks.c:2277 scd/app-openpgp.c:3475 scd/app-dinsig.c:534
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "�得新的個人識別碼 (PIN) 時出錯: %s\n"
 
-#: scd/app-openpgp.c:945
+#: scd/app-openpgp.c:946
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "存放指紋失敗: %s\n"
 
-#: scd/app-openpgp.c:958
+#: scd/app-openpgp.c:959
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "存放創生日期失敗: %s\n"
 
-#: scd/app-openpgp.c:1429 scd/app-openpgp.c:3391 scd/app-openpgp.c:5879
+#: scd/app-openpgp.c:1430 scd/app-openpgp.c:3422 scd/app-openpgp.c:5921
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "從�片�回 CHV 狀態時出錯\n"
 
-#: scd/app-openpgp.c:1951
+#: scd/app-openpgp.c:1952
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "讀�公鑰時失敗: %s\n"
@@ -8379,44 +8389,44 @@ msgstr "讀�公鑰時失敗: %s\n"
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2375
+#: scd/app-openpgp.c:2406
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr ""
 
-#: scd/app-openpgp.c:2623
+#: scd/app-openpgp.c:2654
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "以 %s �為�設 PIN\n"
 
-#: scd/app-openpgp.c:2630
+#: scd/app-openpgp.c:2661
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr "使用 %s �為�設個人識別碼 (PIN) 失敗: %s - 正在�用之後的�設使用\n"
 
-#: scd/app-openpgp.c:2643
+#: scd/app-openpgp.c:2674
 #, fuzzy
 #| msgid "||Please enter the PIN"
 msgid "||Please unlock the card"
 msgstr "||請輸入個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:2702 scd/app-openpgp.c:2902 scd/app-openpgp.c:3370
+#: scd/app-openpgp.c:2733 scd/app-openpgp.c:2933 scd/app-openpgp.c:3401
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "用於 CHV%d 的個人識別碼 (PIN) 太短; 長度最少�有 %d\n"
 
-#: scd/app-openpgp.c:2719 scd/app-openpgp.c:2762 scd/app-openpgp.c:2919
-#: scd/app-openpgp.c:5321
+#: scd/app-openpgp.c:2750 scd/app-openpgp.c:2793 scd/app-openpgp.c:2950
+#: scd/app-openpgp.c:5352
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV%d 失敗: %s\n"
 
-#: scd/app-openpgp.c:2806 scd/app-openpgp.c:5888
+#: scd/app-openpgp.c:2837 scd/app-openpgp.c:5930
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "�片永久鎖定了!!\n"
 
-#: scd/app-openpgp.c:2810
+#: scd/app-openpgp.c:2841
 #, fuzzy, c-format
 #| msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
@@ -8424,20 +8434,20 @@ msgid_plural ""
 "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr[0] "%d 管�者個人識別碼 (PIN) 試圖在�片永久鎖定��留下來\n"
 
-#: scd/app-openpgp.c:2843
+#: scd/app-openpgp.c:2874
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "管�者指令存�權�尚未組態\n"
 
-#: scd/app-openpgp.c:3357
+#: scd/app-openpgp.c:3388
 msgid "||Please enter the PIN"
 msgstr "||請輸入個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:3406
+#: scd/app-openpgp.c:3437
 msgid "||Please enter the Reset Code for the card"
 msgstr "||請輸入�片的�設碼"
 
-#: scd/app-openpgp.c:3416 scd/app-openpgp.c:3485
+#: scd/app-openpgp.c:3447 scd/app-openpgp.c:3516
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "�設碼太短; 長度最少�有 %d\n"
@@ -8445,79 +8455,79 @@ msgstr "�設碼太短; 長度最少�有 %d\n"
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:3439
+#: scd/app-openpgp.c:3470
 msgid "|RN|New Reset Code"
 msgstr "|RN|新增�設碼"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新增管�者個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:3440
+#: scd/app-openpgp.c:3471
 msgid "|N|New PIN"
 msgstr "|N|新增個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:3544
+#: scd/app-openpgp.c:3575
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||請輸入管�者 PIN �新的管�者 PIN"
 
-#: scd/app-openpgp.c:3545
+#: scd/app-openpgp.c:3576
 msgid "||Please enter the PIN and New PIN"
 msgstr "||請輸入個人識別碼�新的個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:3603 scd/app-openpgp.c:5021
+#: scd/app-openpgp.c:3634 scd/app-openpgp.c:5052
 #, c-format
 msgid "error reading application data\n"
 msgstr "讀�應用程�資料時出錯\n"
 
-#: scd/app-openpgp.c:3609 scd/app-openpgp.c:5028
+#: scd/app-openpgp.c:3640 scd/app-openpgp.c:5059
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "讀�指紋 DO 時出錯\n"
 
-#: scd/app-openpgp.c:4305 scd/app-openpgp.c:4654
+#: scd/app-openpgp.c:4336 scd/app-openpgp.c:4685
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "缺�創生時間戳�\n"
 
-#: scd/app-openpgp.c:4346 scd/app-openpgp.c:4354
+#: scd/app-openpgp.c:4377 scd/app-openpgp.c:4385
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 質數 %s 缺�或者並� %d �元大\n"
 
-#: scd/app-openpgp.c:4648
+#: scd/app-openpgp.c:4679
 #, fuzzy, c-format
 #| msgid "unsupported inquiry '%s'\n"
 msgid "unsupported curve\n"
 msgstr "未支�的查詢 '%s'\n"
 
-#: scd/app-openpgp.c:4986
+#: scd/app-openpgp.c:5017
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "無效的 OpenPGP �片�構 (DO 0x93)\n"
 
-#: scd/app-openpgp.c:5036
+#: scd/app-openpgp.c:5067
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "�片上的指紋與所�求的那個並���\n"
 
-#: scd/app-openpgp.c:5236
+#: scd/app-openpgp.c:5267
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "�片�支� %s 摘�演算法\n"
 
-#: scd/app-openpgp.c:5294
+#: scd/app-openpgp.c:5325
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目�建立的簽章: %lu\n"
 
-#: scd/app-openpgp.c:5893
+#: scd/app-openpgp.c:5935
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目�在此指令中的管�者 PIN 驗證被�止了\n"
 
-#: scd/app-openpgp.c:6420 scd/app-openpgp.c:6431
+#: scd/app-openpgp.c:6469 scd/app-openpgp.c:6481
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存� %s - 無效的 OpenPGP �片?\n"
@@ -8537,7 +8547,7 @@ msgstr "|N|開始新增個人識別碼 (PIN)"
 msgid "run in multi server mode (foreground)"
 msgstr "以多�伺�器模�執行 (�景)"
 
-#: scd/scdaemon.c:136 sm/gpgsm.c:278 dirmngr/dirmngr.c:202
+#: scd/scdaemon.c:136 sm/gpgsm.c:279 dirmngr/dirmngr.c:202
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|等級|設定除錯等級為指定等級"
 
@@ -8581,11 +8591,11 @@ msgstr ""
 msgid "deny the use of admin card commands"
 msgstr "�用管�者�片指令"
 
-#: scd/scdaemon.c:325
+#: scd/scdaemon.c:326
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "用法: @SCDAEMON@ [�項] (或用 -h 求助)"
 
-#: scd/scdaemon.c:327
+#: scd/scdaemon.c:328
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -8593,22 +8603,22 @@ msgstr ""
 "語法: scdaemon [�項] [指令 [引數]]\n"
 "@GNUPG@ 智慧��務\n"
 
-#: scd/scdaemon.c:819
+#: scd/scdaemon.c:820
 #, c-format
 msgid "please use the option '--daemon' to run the program in the background\n"
 msgstr "請使用 '--daemon' �項來將此程�執行於背景\n"
 
-#: scd/scdaemon.c:1195 dirmngr/dirmngr.c:2207
+#: scd/scdaemon.c:1196 dirmngr/dirmngr.c:2211
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "用於 fd %d 的經手程�已啟動\n"
 
-#: scd/scdaemon.c:1207 dirmngr/dirmngr.c:2215
+#: scd/scdaemon.c:1208 dirmngr/dirmngr.c:2219
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "用於 fd %d 的經手程�已終止\n"
 
-#: sm/call-agent.c:1098 sm/certlist.c:131 sm/keylist.c:336
+#: sm/call-agent.c:1098 sm/certlist.c:133 sm/keylist.c:338
 #: dirmngr/validate.c:1262
 #, c-format
 msgid "error getting key usage information: %s\n"
@@ -8834,7 +8844,7 @@ msgstr "根憑證未標記為已信任"
 msgid "checking the trust list failed: %s\n"
 msgstr "檢查信任清單時失敗: %s\n"
 
-#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1478 dirmngr/validate.c:631
+#: sm/certchain.c:1801 sm/import.c:175 sm/keylist.c:1496 dirmngr/validate.c:631
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "憑證�太長\n"
@@ -8889,7 +8899,7 @@ msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u �元的雜湊� %u �元的 %s 金鑰來說是無效的\n"
 
 #: sm/certcheck.c:239 sm/certcheck.c:263 dirmngr/crlcache.c:1542
-#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1459 dirmngr/validate.c:906
+#: dirmngr/crlcache.c:1566 dirmngr/dirmngr.c:1463 dirmngr/validate.c:906
 #: dirmngr/validate.c:930
 #, c-format
 msgid "out of core\n"
@@ -8934,42 +8944,42 @@ msgstr ""
 "S/N %s, ID 0x%08lX,\n"
 "建立於 %s, 於 %s 到期.\n"
 
-#: sm/certlist.c:121 dirmngr/validate.c:1252
+#: sm/certlist.c:123 dirmngr/validate.c:1252
 #, c-format
 msgid "no key usage specified - assuming all usages\n"
 msgstr "沒有指定的金鑰用途 - �設為所有的用途\n"
 
-#: sm/certlist.c:142 dirmngr/validate.c:1293
+#: sm/certlist.c:144 dirmngr/validate.c:1293
 #, c-format
 msgid "certificate should not have been used for certification\n"
 msgstr "憑證應該還未被用於憑證\n"
 
-#: sm/certlist.c:155 dirmngr/validate.c:1303
+#: sm/certlist.c:157 dirmngr/validate.c:1303
 #, c-format
 msgid "certificate should not have been used for OCSP response signing\n"
 msgstr "憑證應該還未被用於 OCSP 回應簽署\n"
 
-#: sm/certlist.c:168 dirmngr/validate.c:1286
+#: sm/certlist.c:173 dirmngr/validate.c:1286
 #, c-format
 msgid "certificate should not have been used for encryption\n"
 msgstr "憑證應該還未被用於加密\n"
 
-#: sm/certlist.c:169 dirmngr/validate.c:1276
+#: sm/certlist.c:174 dirmngr/validate.c:1276
 #, c-format
 msgid "certificate should not have been used for signing\n"
 msgstr "憑證應該還未被用於簽署\n"
 
-#: sm/certlist.c:170 dirmngr/validate.c:1287
+#: sm/certlist.c:175 dirmngr/validate.c:1287
 #, c-format
 msgid "certificate is not usable for encryption\n"
 msgstr "憑證無法用於加密\n"
 
-#: sm/certlist.c:171 dirmngr/validate.c:1277
+#: sm/certlist.c:176 dirmngr/validate.c:1277
 #, c-format
 msgid "certificate is not usable for signing\n"
 msgstr "憑證無法用於簽署\n"
 
-#: sm/certlist.c:361
+#: sm/certlist.c:366
 #, fuzzy, c-format
 #| msgid "lookup a certificate"
 msgid "looking for another certificate\n"
@@ -9156,6 +9166,11 @@ msgstr "�建立自簽憑證嗎? (y/N) "
 msgid "These parameters are used:\n"
 msgstr "採用下列這些�數:\n"
 
+#: sm/certreqgen-ui.c:433
+#, c-format
+msgid "error creating temporary file: %s\n"
+msgstr "建立暫存檔時出錯: %s\n"
+
 #: sm/certreqgen-ui.c:439
 msgid "Now creating self-signed certificate.  "
 msgstr "�在正在建立自簽憑證.  "
@@ -9227,123 +9242,123 @@ msgstr "刪除憑證 \"%s\" 時失敗: %s\n"
 msgid "no valid recipients given\n"
 msgstr "沒有給定有效的收件者\n"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:231
 msgid "list external keys"
 msgstr "列出外部金鑰"
 
-#: sm/gpgsm.c:232
+#: sm/gpgsm.c:233
 msgid "list certificate chain"
 msgstr "列出憑證�"
 
-#: sm/gpgsm.c:240
+#: sm/gpgsm.c:241
 msgid "import certificates"
 msgstr "匯入憑證"
 
-#: sm/gpgsm.c:241
+#: sm/gpgsm.c:242
 msgid "export certificates"
 msgstr "匯出憑證"
 
-#: sm/gpgsm.c:249
+#: sm/gpgsm.c:250
 msgid "register a smartcard"
 msgstr "註冊智慧�"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:253
 msgid "pass a command to the dirmngr"
 msgstr "將指令��給 dirmngr"
 
-#: sm/gpgsm.c:254
+#: sm/gpgsm.c:255
 msgid "invoke gpg-protect-tool"
 msgstr "�用 gpg-protect-tool"
 
-#: sm/gpgsm.c:274
+#: sm/gpgsm.c:275
 msgid "don't use the terminal at all"
 msgstr "完全��使用終端機"
 
-#: sm/gpgsm.c:301
+#: sm/gpgsm.c:302
 msgid "|N|number of certificates to include"
 msgstr "|N|�包�的憑證數�"
 
-#: sm/gpgsm.c:303
+#: sm/gpgsm.c:304
 msgid "|FILE|take policy information from FILE"
 msgstr "|檔案|從指定檔案中�得原則資訊"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:320
 msgid "assume input is in PEM format"
 msgstr "�設輸入的是 PEM 格�"
 
-#: sm/gpgsm.c:321
+#: sm/gpgsm.c:322
 msgid "assume input is in base-64 format"
 msgstr "�設輸入的是 base-64 格�"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:324
 msgid "assume input is in binary format"
 msgstr "�設輸入的是二進制格�"
 
-#: sm/gpgsm.c:332
+#: sm/gpgsm.c:333
 msgid "create base-64 encoded output"
 msgstr "建立以 base-64 編碼�的輸出"
 
-#: sm/gpgsm.c:344
+#: sm/gpgsm.c:345
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|使用者-ID|使用指定使用者 ID �為�設�鑰"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:356
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|檔案|將此金鑰鑰匙圈加到指定金鑰鑰匙圈清單檔案中"
 
-#: sm/gpgsm.c:368
+#: sm/gpgsm.c:369
 msgid "fetch missing issuer certificates"
 msgstr "�回�失的發行者憑證"
 
-#: sm/gpgsm.c:370
+#: sm/gpgsm.c:371
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|�稱|將指定�稱的編碼用於 PKCS#12 密語"
 
-#: sm/gpgsm.c:391
+#: sm/gpgsm.c:392
 msgid "never consult a CRL"
 msgstr "永���查閱 CRL"
 
-#: sm/gpgsm.c:395
+#: sm/gpgsm.c:396
 msgid "do not check CRLs for root certificates"
 msgstr "��為根憑證檢查 CRL"
 
-#: sm/gpgsm.c:399
+#: sm/gpgsm.c:400
 msgid "check validity using OCSP"
 msgstr "用 OCSP 檢查有效性"
 
-#: sm/gpgsm.c:401
+#: sm/gpgsm.c:402
 msgid "do not check certificate policies"
 msgstr "��檢查憑證原則"
 
-#: sm/gpgsm.c:404
+#: sm/gpgsm.c:405
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|�稱|使用指定�稱的編密演算法"
 
-#: sm/gpgsm.c:406
+#: sm/gpgsm.c:407
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|�稱|使用指定�稱的訊�摘�演算法"
 
-#: sm/gpgsm.c:416
+#: sm/gpgsm.c:417
 msgid "batch mode: never ask"
 msgstr "批次模�: 永��詢�"
 
-#: sm/gpgsm.c:418
+#: sm/gpgsm.c:419
 msgid "assume yes on most questions"
 msgstr "�設大部分的�題都回答是"
 
-#: sm/gpgsm.c:419
+#: sm/gpgsm.c:420
 msgid "assume no on most questions"
 msgstr "�設大部分的�題都回答�"
 
-#: sm/gpgsm.c:436
+#: sm/gpgsm.c:437
 msgid "|FILE|write an audit log to FILE"
 msgstr "|檔案|將稽核日誌寫入至指定檔案"
 
-#: sm/gpgsm.c:620
+#: sm/gpgsm.c:630
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "用法: @GPGSM@ [�項] [檔案] (或用 -h 求助)"
 
-#: sm/gpgsm.c:623
+#: sm/gpgsm.c:633
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -9353,27 +9368,27 @@ msgstr ""
 "用 S/MIME �定來簽署, 檢查, 加密, 解密\n"
 "�設的�作會�輸入資料而定\n"
 
-#: sm/gpgsm.c:831
+#: sm/gpgsm.c:841
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "請注�: 將無法加密為 '%s': %s\n"
 
-#: sm/gpgsm.c:842
+#: sm/gpgsm.c:852
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "未知的驗證模型 '%s'\n"
 
-#: sm/gpgsm.c:1728
+#: sm/gpgsm.c:1749
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "正在匯入通用憑證 '%s'\n"
 
-#: sm/gpgsm.c:1774
+#: sm/gpgsm.c:1795
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "無法用 '%s' 來簽署: %s\n"
 
-#: sm/gpgsm.c:2146
+#: sm/gpgsm.c:2167
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "無效的指令 (沒有這樣的指令)\n"
@@ -9403,7 +9418,7 @@ msgstr "�得已存放的旗標時出錯: %s\n"
 msgid "error importing certificate: %s\n"
 msgstr "匯入憑證時出錯: %s\n"
 
-#: sm/import.c:753 tools/gpg-connect-agent.c:1476
+#: sm/import.c:753 tools/gpg-connect-agent.c:1481
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "讀�輸入時出錯: %s\n"
@@ -9445,7 +9460,7 @@ msgstr "�新�尋憑證的�題: %s\n"
 msgid "error storing flags: %s\n"
 msgstr "存放旗標時出錯: %s\n"
 
-#: sm/keylist.c:757
+#: sm/keylist.c:775
 msgid "Error - "
 msgstr "錯誤 - "
 
@@ -9815,11 +9830,6 @@ msgstr "建立暫存快�目錄檔案 '%s' 失敗: %s\n"
 msgid "error closing '%s': %s\n"
 msgstr "關閉 '%s' 時出錯: %s\n"
 
-#: dirmngr/crlcache.c:948
-#, c-format
-msgid "error renaming '%s' to '%s': %s\n"
-msgstr "把 '%s' �新命�� '%s' 時出錯: %s\n"
-
 #: dirmngr/crlcache.c:1002
 #, c-format
 msgid "can't hash '%s': %s\n"
@@ -10485,92 +10495,92 @@ msgstr "有效的除錯等級為: %s\n"
 msgid "usage: %s [options] "
 msgstr "用法: %s [�項] "
 
-#: dirmngr/dirmngr.c:1343
+#: dirmngr/dirmngr.c:1347
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "socket �稱內��許使用冒號\n"
 
-#: dirmngr/dirmngr.c:1582 dirmngr/server.c:1885
+#: dirmngr/dirmngr.c:1586 dirmngr/server.c:1885
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "從 '%s' �回 CRL 時失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1588 dirmngr/server.c:1891
+#: dirmngr/dirmngr.c:1592 dirmngr/server.c:1891
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "從 '%s' 處� CRL 時失敗: %s\n"
 
-#: dirmngr/dirmngr.c:1730
+#: dirmngr/dirmngr.c:1734
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: 列太長 - 已跳�\n"
 
-#: dirmngr/dirmngr.c:1790 dirmngr/dirmngr.c:1879
+#: dirmngr/dirmngr.c:1794 dirmngr/dirmngr.c:1883
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: �測到無效的指紋\n"
 
-#: dirmngr/dirmngr.c:1831 dirmngr/dirmngr.c:1857 tools/gpgconf-comp.c:3569
+#: dirmngr/dirmngr.c:1835 dirmngr/dirmngr.c:1861 tools/gpgconf-comp.c:3572
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: 讀�錯誤: %s\n"
 
-#: dirmngr/dirmngr.c:1892
+#: dirmngr/dirmngr.c:1896
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: 列尾的垃圾已忽略\n"
 
-#: dirmngr/dirmngr.c:1979
+#: dirmngr/dirmngr.c:1983
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "收到 SIGHUP - 正在�新讀�組態並清除快�\n"
 
-#: dirmngr/dirmngr.c:2020
+#: dirmngr/dirmngr.c:2024
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "收到 SIGUSR2 - 無定義行動\n"
 
-#: dirmngr/dirmngr.c:2025
+#: dirmngr/dirmngr.c:2029
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "收到 SIGTERM - 正在關閉 ...\n"
 
-#: dirmngr/dirmngr.c:2027
+#: dirmngr/dirmngr.c:2031
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "收到 SIGTERM - 還有 %d 個使用中的連線\n"
 
-#: dirmngr/dirmngr.c:2032
+#: dirmngr/dirmngr.c:2036
 #, c-format
 msgid "shutdown forced\n"
 msgstr "已強迫關閉\n"
 
-#: dirmngr/dirmngr.c:2040
+#: dirmngr/dirmngr.c:2044
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "收到 SIGINT - 立�關閉\n"
 
-#: dirmngr/dirmngr.c:2047
+#: dirmngr/dirmngr.c:2051
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "收到訊號 %d - 無定義行動\n"
 
-#: dirmngr/http.c:1998 dirmngr/ocsp.c:258
+#: dirmngr/http.c:2032 dirmngr/ocsp.c:258
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "存� '%s' 時出錯: http 狀態 %u\n"
 
-#: dirmngr/http.c:3652 dirmngr/ocsp.c:232
+#: dirmngr/http.c:3686 dirmngr/ocsp.c:232
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "網� '%s' �新轉�至 '%s' (%u)\n"
 
-#: dirmngr/http.c:3658 dirmngr/ocsp.c:249
+#: dirmngr/http.c:3692 dirmngr/ocsp.c:249
 #, c-format
 msgid "too many redirections\n"
 msgstr "太多�新導�\n"
 
-#: dirmngr/http.c:3768
+#: dirmngr/http.c:3802
 #, fuzzy, c-format
 #| msgid "writing to '%s'\n"
 msgid "redirection changed to '%s'\n"
@@ -10934,57 +10944,57 @@ msgstr "憑證�完好\n"
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "憑證應該還未被用於 CRL 簽署\n"
 
-#: tools/gpg-connect-agent.c:86 tools/gpgconf.c:118
+#: tools/gpg-connect-agent.c:87 tools/gpgconf.c:118
 msgid "quiet"
 msgstr "安�模�"
 
-#: tools/gpg-connect-agent.c:87
+#: tools/gpg-connect-agent.c:88
 msgid "print data out hex encoded"
 msgstr "列�資料超出�六進制編碼範�"
 
-#: tools/gpg-connect-agent.c:88
+#: tools/gpg-connect-agent.c:89
 msgid "decode received data lines"
 msgstr "�已收到的資料列解碼"
 
-#: tools/gpg-connect-agent.c:89
+#: tools/gpg-connect-agent.c:90
 msgid "connect to the dirmngr"
 msgstr "連線至 dirmngr"
 
-#: tools/gpg-connect-agent.c:90
+#: tools/gpg-connect-agent.c:91
 #, fuzzy
 #| msgid "connect to the dirmngr"
 msgid "connect to the keyboxd"
 msgstr "連線至 dirmngr"
 
-#: tools/gpg-connect-agent.c:93
+#: tools/gpg-connect-agent.c:94
 msgid "|NAME|connect to Assuan socket NAME"
 msgstr "|�稱|連線至指定�稱的 Assuan socket"
 
-#: tools/gpg-connect-agent.c:95
+#: tools/gpg-connect-agent.c:96
 msgid "|ADDR|connect to Assuan server at ADDR"
 msgstr "|ADDR|連線至�於 ADDR 的 Assuan 伺�器"
 
-#: tools/gpg-connect-agent.c:97
+#: tools/gpg-connect-agent.c:98
 msgid "run the Assuan server given on the command line"
 msgstr "執行命令列所給定的 Assuan 伺�器"
 
-#: tools/gpg-connect-agent.c:99
+#: tools/gpg-connect-agent.c:100
 msgid "do not use extended connect mode"
 msgstr "��使用延伸連線模�"
 
-#: tools/gpg-connect-agent.c:101
+#: tools/gpg-connect-agent.c:102
 msgid "|FILE|run commands from FILE on startup"
 msgstr "|檔案|啟動時執行指定檔案中的指令"
 
-#: tools/gpg-connect-agent.c:102
+#: tools/gpg-connect-agent.c:103
 msgid "run /subst on startup"
 msgstr "啟動時執行 /subst"
 
-#: tools/gpg-connect-agent.c:223
+#: tools/gpg-connect-agent.c:226
 msgid "Usage: @GPG@-connect-agent [options] (-h for help)"
 msgstr "用法: @GPG@-connect-agent [�項] (或用 -h 求助)"
 
-#: tools/gpg-connect-agent.c:226
+#: tools/gpg-connect-agent.c:229
 msgid ""
 "Syntax: @GPG@-connect-agent [options]\n"
 "Connect to a running agent and send commands\n"
@@ -10992,49 +11002,49 @@ msgstr ""
 "語法: @GPG@-connect-agent [�項]\n"
 "連線至�作中的代�程�並�出指令\n"
 
-#: tools/gpg-connect-agent.c:1281
+#: tools/gpg-connect-agent.c:1282
 #, c-format
 msgid "option \"%s\" requires a program and optional arguments\n"
 msgstr "\"%s\" �項需�有程���用的引數\n"
 
-#: tools/gpg-connect-agent.c:1292 tools/gpg-connect-agent.c:1298
-#: tools/gpg-connect-agent.c:1304
+#: tools/gpg-connect-agent.c:1293 tools/gpg-connect-agent.c:1299
+#: tools/gpg-connect-agent.c:1305
 #, c-format
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "\"%s\" �項因為 \"%s\" 而被忽略了\n"
 
-#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1916
+#: tools/gpg-connect-agent.c:1402 tools/gpg-connect-agent.c:1921
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "接收列時失敗: %s\n"
 
-#: tools/gpg-connect-agent.c:1501
+#: tools/gpg-connect-agent.c:1506
 #, c-format
 msgid "line too long - skipped\n"
 msgstr "列太長 - 已跳�\n"
 
-#: tools/gpg-connect-agent.c:1505
+#: tools/gpg-connect-agent.c:1510
 #, c-format
 msgid "line shortened due to embedded Nul character\n"
 msgstr "列因嵌入的 Nul 字符而縮短了\n"
 
-#: tools/gpg-connect-agent.c:1890
+#: tools/gpg-connect-agent.c:1895
 #, c-format
 msgid "unknown command '%s'\n"
 msgstr "未知的指令 '%s'\n"
 
-#: tools/gpg-connect-agent.c:1908
+#: tools/gpg-connect-agent.c:1913
 #, c-format
 msgid "sending line failed: %s\n"
 msgstr "�出列時失敗: %s\n"
 
-#: tools/gpg-connect-agent.c:2319
+#: tools/gpg-connect-agent.c:2320
 #, fuzzy, c-format
 #| msgid "no gpg-agent running in this session\n"
 msgid "no keybox daemon running in this session\n"
 msgstr "在此階段中沒有執行中的 gpg-agent\n"
 
-#: tools/gpg-connect-agent.c:2325
+#: tools/gpg-connect-agent.c:2326
 #, c-format
 msgid "error sending standard options: %s\n"
 msgstr "�出標準�項時出錯: %s\n"
@@ -11106,13 +11116,13 @@ msgstr "元件 %s 的外部驗證失敗"
 msgid "Note that group specifications are ignored\n"
 msgstr "請注�群組�格已忽略\n"
 
-#: tools/gpgconf-comp.c:3573
+#: tools/gpgconf-comp.c:3576
 #, fuzzy, c-format
 #| msgid "error closing '%s': %s\n"
 msgid "error closing '%s'\n"
 msgstr "關閉 '%s' 時出錯: %s\n"
 
-#: tools/gpgconf-comp.c:3575
+#: tools/gpgconf-comp.c:3578
 #, fuzzy, c-format
 #| msgid "error hashing '%s': %s\n"
 msgid "error parsing '%s'\n"
@@ -11308,6 +11318,14 @@ msgstr ""
 msgid "manage the command history"
 msgstr ""
 
+#~ msgid "error writing to temporary file: %s\n"
+#~ msgstr "寫入暫存檔時出錯: %s\n"
+
+#, fuzzy
+#~| msgid "run in server mode"
+#~ msgid "run in supervised mode"
+#~ msgstr "以伺�器模�執行"
+
 #~ msgid "Name may not start with a digit\n"
 #~ msgstr "姓���以用數字開頭\n"
 
@@ -11653,9 +11671,6 @@ msgstr ""
 #~ msgid "could not open %s for writing: %s\n"
 #~ msgstr "無法開啟 %s 來寫入: %s\n"
 
-#~ msgid "error writing to %s: %s\n"
-#~ msgstr "寫入 %s 時出錯: %s\n"
-
 #~ msgid "error closing %s: %s\n"
 #~ msgstr "關閉 %s 時出錯: %s\n"
 
diff --git a/scd/apdu.c b/scd/apdu.c
index 574697c..e83815b 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -2015,7 +2015,7 @@ apdu_dev_list_start (const char *portstr, struct dev_list **l_p)
 #endif
     { /* PC/SC readers.  */
       long r;
-      pcsc_dword_t nreader;
+      pcsc_dword_t nreader = 0;
       char *p = NULL;
 
       if (!pcsc.context)
diff --git a/scd/app-nks.c b/scd/app-nks.c
index 31b91ac..468c99c 100644
--- a/scd/app-nks.c
+++ b/scd/app-nks.c
@@ -1,6 +1,6 @@
 /* app-nks.c - The Telesec NKS card application.
  * Copyright (C) 2004, 2007-2009 Free Software Foundation, Inc.
- * Copyright (C) 2004, 2007-2009, 2013-2015, 2020 g10 Code GmbH
+ * Copyright (C) 2004, 2007-2009, 2013-2015, 2020, 2022 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -100,7 +100,8 @@ static char const aid_idlm[] = { 0xD2, 0x76, 0x00, 0x00, 0x03, 0x0c, 0x01 };
 
 static struct
 {
-  int nks_app_id;/* One of the NKS_APP_ constants.  */
+  int nks_app_id;/* One of NKS_APP_*.  Keep them sorted so that no
+                  * unnecessary application switching is needed.  */
   int fid;       /* File ID. */
   int nks_ver;   /* 0 for NKS version 2, 3 for version 3, etc.  */
   int certtype;  /* Type of certificate or 0 if it is not a certificate. */
@@ -157,7 +158,7 @@ static struct
   { 1, 0xC008, 3, 101 },                    /* EF_C.CA.SIG  */
   { 1, 0xC00E, 3, 111 },                    /* EF_C.RCA.SIG  */
 
-  { 2, 0x4531, 15, 0, 0xC001, 0,1,1, 0x84}, /* EF_PK.CH.SIG  */
+  { 2, 0x4531, 15, 0, 0xC001, 0,1,0, 0x84}, /* EF_PK.CH.SIG  */
   { 2, 0xC000, 15,101 },                    /* EF.C.SCA.QES (SubCA) */
   { 2, 0xC001, 15,100 },                    /* EF.C.ICC.QES (Cert)  */
   { 2, 0xC00E, 15,111 },                    /* EF.C.RCA.QES (RootCA */
@@ -211,6 +212,8 @@ static gpg_error_t verify_pin (app_t app, int pwid, const char *desc,
                                gpg_error_t (*pincb)(void*, const char *,
                                                     char **),
                                void *pincb_arg);
+static gpg_error_t parse_keyref (app_t app, const char *keyref,
+                                 int want_keypair, int *r_fididx);
 
 
 
@@ -500,7 +503,7 @@ static gpg_error_t
 find_fid_by_keyref (app_t app, const char *keyref, int *r_idx, int *r_algo)
 {
   gpg_error_t err;
-  int idx, fid, nks_app_id;
+  int idx;
   char keygripstr[2*KEYGRIP_LEN+1];
 
   if (!keyref || !keyref[0])
@@ -509,10 +512,14 @@ find_fid_by_keyref (app_t app, const char *keyref, int *r_idx, int *r_algo)
     {
       struct fid_cache_s *ci;
 
-      for (ci = app->app_local->fid_cache; ci; ci = ci->next)
+      /* FIXME: Our cache structure needs to be revised.  It doesn't
+       * take the app_id into account and we don't have a way to
+       * directly access the FID item if there are several of them
+       * with different app_ids.  We disable the cache for now. */
+      for (ci = app->app_local->fid_cache ; ci; ci = ci->next)
         if (ci->fid && ci->got_keygrip && !strcmp (ci->keygripstr, keyref))
           break;
-      if (ci) /* Cached */
+      if (ci && 0 ) /* Cached (disabled) */
         {
           for (idx=0; filelist[idx].fid; idx++)
             if (filelist[idx].fid == ci->fid)
@@ -577,45 +584,12 @@ find_fid_by_keyref (app_t app, const char *keyref, int *r_idx, int *r_algo)
     }
   else /* This is a usual keyref.  */
     {
-      if (!ascii_strncasecmp (keyref, "NKS-NKS3.", 9))
-        nks_app_id = NKS_APP_NKS;
-      else if (!ascii_strncasecmp (keyref, "NKS-ESIGN.", 10)
-               && app->app_local->qes_app_id == NKS_APP_ESIGN)
-        nks_app_id = NKS_APP_ESIGN;
-      else if (!ascii_strncasecmp (keyref, "NKS-SIGG.", 9)
-               && app->app_local->qes_app_id == NKS_APP_SIGG)
-        nks_app_id = NKS_APP_SIGG;
-      else if (!ascii_strncasecmp (keyref, "NKS-IDLM.", 9))
-        nks_app_id = NKS_APP_IDLM;
-      else if (!ascii_strncasecmp (keyref, "NKS-DF01.", 9))
-        nks_app_id = NKS_APP_NKS;
-      else
-        {
-          err = gpg_error (GPG_ERR_INV_ID);
-          goto leave;
-        }
-      keyref += nks_app_id == NKS_APP_ESIGN? 10 : 9;
-
-      if (!hexdigitp (keyref) || !hexdigitp (keyref+1)
-          || !hexdigitp (keyref+2) || !hexdigitp (keyref+3)
-          || keyref[4])
-        {
-          err = gpg_error (GPG_ERR_INV_ID);
-          goto leave;
-        }
-      fid = xtoi_4 (keyref);
-      for (idx=0; filelist[idx].fid; idx++)
-        if (filelist[idx].iskeypair && filelist[idx].fid == fid
-            && filelist[idx].nks_app_id == nks_app_id)
-          break;
-      if (!filelist[idx].fid)
-        {
-          err = gpg_error (GPG_ERR_NOT_FOUND);
-          goto leave;
-        }
+      err = parse_keyref (app, keyref, 1, &idx);
+      if (err)
+        goto leave;
       *r_idx = idx;
 
-      err = switch_application (app, nks_app_id);
+      err = switch_application (app, filelist[idx].nks_app_id);
       if (err)
         goto leave;
       if (r_algo)
@@ -795,6 +769,51 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name)
 }
 
 
+/* Parse a keyref (NKS_*.*) and return the corresponding EF as an
+ * index into the filetable.  With WANT_KEYPAIR set a keypair EF is
+ * requested; otherwise also cert EFs are returned.  */
+static gpg_error_t
+parse_keyref (app_t app, const char *keyref, int want_keypair, int *r_fididx)
+{
+  int nks_app_id, fid, idx;
+
+  if (!ascii_strncasecmp (keyref, "NKS-NKS3.", 9))
+    nks_app_id = NKS_APP_NKS;
+  else if (!ascii_strncasecmp (keyref, "NKS-ESIGN.", 10)
+           && (!want_keypair || app->app_local->qes_app_id == NKS_APP_ESIGN))
+    nks_app_id = NKS_APP_ESIGN;
+  else if (!ascii_strncasecmp (keyref, "NKS-SIGG.", 9)
+           && (!want_keypair || app->app_local->qes_app_id == NKS_APP_SIGG))
+    nks_app_id = NKS_APP_SIGG;
+  else if (!ascii_strncasecmp (keyref, "NKS-IDLM.", 9))
+    nks_app_id = NKS_APP_IDLM;
+  else if (!ascii_strncasecmp (keyref, "NKS-DF01.", 9))
+    nks_app_id = NKS_APP_NKS;
+  else
+    return gpg_error (GPG_ERR_INV_ID);
+
+  keyref += nks_app_id == NKS_APP_ESIGN? 10 : 9;
+
+  if (!hexdigitp (keyref) || !hexdigitp (keyref+1)
+      || !hexdigitp (keyref+2) || !hexdigitp (keyref+3)
+      || keyref[4])
+    return gpg_error (GPG_ERR_INV_ID);
+  fid = xtoi_4 (keyref);
+  for (idx=0; filelist[idx].fid; idx++)
+    if (filelist[idx].fid == fid
+        && filelist[idx].nks_app_id == nks_app_id
+        && ((want_keypair && filelist[idx].iskeypair)
+            || (!want_keypair
+                && (filelist[idx].certtype || filelist[idx].iskeypair > 0))))
+      break;
+  if (!filelist[idx].fid)
+    return gpg_error (GPG_ERR_NOT_FOUND);
+
+  *r_fididx = idx;
+  return 0;
+}
+
+
 const char *
 get_nks_tag (app_t app, int nks_app_id)
 {
@@ -815,6 +834,21 @@ get_nks_tag (app_t app, int nks_app_id)
 }
 
 static void
+set_usage_string (char usagebuf[5], int i)
+{
+  int usageidx = 0;
+  if (filelist[i].issignkey)
+    usagebuf[usageidx++] = 's';
+  if (filelist[i].isauthkey)
+    usagebuf[usageidx++] = 'a';
+  if (filelist[i].isencrkey)
+    usagebuf[usageidx++] = 'e';
+  if (!usageidx)
+    usagebuf[usageidx++] = '-';
+  usagebuf[usageidx] = 0;
+}
+
+static void
 do_learn_status_core (app_t app, ctrl_t ctrl, unsigned int flags,
                       int nks_app_id)
 {
@@ -856,7 +890,6 @@ do_learn_status_core (app_t app, ctrl_t ctrl, unsigned int flags,
         {
           char gripstr[40+1];
           char usagebuf[5];
-          int usageidx = 0;
           char *algostr = NULL;
 
           err = keygripstr_from_pk_file (app, filelist[i].fid,
@@ -869,15 +902,7 @@ do_learn_status_core (app_t app, ctrl_t ctrl, unsigned int flags,
             {
               snprintf (id_buf, sizeof id_buf, "NKS-%s.%04X",
                         tag, filelist[i].fid);
-              if (filelist[i].issignkey)
-                usagebuf[usageidx++] = 's';
-              if (filelist[i].isauthkey)
-                usagebuf[usageidx++] = 'a';
-              if (filelist[i].isencrkey)
-                usagebuf[usageidx++] = 'e';
-              if (!usageidx)
-                usagebuf[usageidx++] = '-';
-              usagebuf[usageidx] = 0;
+              set_usage_string (usagebuf, i);
               send_status_info (ctrl, "KEYPAIRINFO",
                                 gripstr, 40,
                                 id_buf, strlen (id_buf),
@@ -918,9 +943,8 @@ do_learn_status (app_t app, ctrl_t ctrl, unsigned int flags)
 }
 
 
-
 /* Helper to read a certificate from the file FID.  The function
- * assumes that the the application has already been selected.  */
+ * assumes that the application has already been selected.  */
 static gpg_error_t
 readcert_from_ef (app_t app, int fid, unsigned char **cert, size_t *certlen)
 {
@@ -954,7 +978,7 @@ readcert_from_ef (app_t app, int fid, unsigned char **cert, size_t *certlen)
       return err;
     }
 
-  if (!buflen || *buffer == 0xff)
+  if (!buflen || *buffer == 0xff || all_zero_p (buffer, buflen))
     {
       log_info ("nks: no certificate contained in FID 0x%04X\n", fid);
       err = gpg_error (GPG_ERR_NOT_FOUND);
@@ -1045,21 +1069,29 @@ iterate_over_filelist (app_t app, const char *want_keygripstr, int capability,
   for (idx++; filelist[idx].fid; idx++)
     {
       if (filelist[idx].nks_ver > app->appversion)
-        continue;
+        continue; /* EF not support by this card version.  */
 
       if (!filelist[idx].iskeypair)
-        continue;
+        continue; /* Skip - We are only interested in keypairs.  */
 
       if (app->app_local->only_idlm)
         {
+          /* IDLM cards have no other applications we want to switch
+           * to.  We skip all EFs which are not known for IDLM.  */
           if (filelist[idx].nks_app_id != NKS_APP_IDLM)
             continue;
         }
       else
         {
+          /* Skip all EFs which are not for NKS or the card's
+           * implementation for a qualified electoric signature (QES)
+           * which is either the old SIGG or the newer ESIGN.  */
           if (filelist[idx].nks_app_id != NKS_APP_NKS
               && filelist[idx].nks_app_id != app->app_local->qes_app_id)
             continue;
+
+          /* Switch if needed.  Note that the filelist should be
+           * sorted to avoid unnecessary switches.  */
           err = switch_application (app, filelist[idx].nks_app_id);
           if (err)
             {
@@ -1068,6 +1100,8 @@ iterate_over_filelist (app_t app, const char *want_keygripstr, int capability,
             }
         }
 
+      /* Get the keygrip from the EF.  Note that this functions
+       * consults the cache to avoid computing the keygrip again.  */
       err = keygripstr_from_pk_file (app, filelist[idx].fid,
                                      filelist[idx].iskeypair, keygripstr,
                                      NULL, NULL);
@@ -1080,6 +1114,7 @@ iterate_over_filelist (app_t app, const char *want_keygripstr, int capability,
 
       if (want_keygripstr)
         {
+          /* If the keygrip matches the requested one we are ready.  */
           if (!strcmp (keygripstr, want_keygripstr))
             {
               /* Found */
@@ -1087,8 +1122,10 @@ iterate_over_filelist (app_t app, const char *want_keygripstr, int capability,
               return 0;
             }
         }
-      else
+      else /* No keygrip requested - list all .  */
         {
+          /* If a capability has been requested return only keys with
+           * that capability.  */
           if (capability == GCRY_PK_USAGE_SIGN)
             {
               if (!filelist[idx].issignkey)
@@ -1105,7 +1142,7 @@ iterate_over_filelist (app_t app, const char *want_keygripstr, int capability,
                 continue;
             }
 
-          /* Found */
+          /* Found.  Return but save the last idenx of the loop.  */
           *idx_p = idx;
           return 0;
         }
@@ -1119,6 +1156,7 @@ iterate_over_filelist (app_t app, const char *want_keygripstr, int capability,
   return err;
 }
 
+
 /* Read the certificate with id CERTID (as returned by learn_status in
    the CERTINFO status lines) and return it in the freshly allocated
    buffer put into CERT and the length of the certificate put into
@@ -1127,69 +1165,46 @@ static gpg_error_t
 do_readcert (app_t app, const char *certid,
              unsigned char **cert, size_t *certlen)
 {
-  int i, fid;
+  int idx, fid;
   gpg_error_t err;
-  int nks_app_id;
 
   *cert = NULL;
   *certlen = 0;
 
-  /* Handle the case with KEYGRIP.  */
-  if (strlen (certid) == 40)
+  /* Handle the case with KEYGRIP.  We got a keygrip if the string has
+   * a length of 40 and does not start with an N as in NKS-* */
+  if (certid[0] != 'N' && strlen (certid) == 40)
     {
       char keygripstr[2*KEYGRIP_LEN+1];
 
-      i = -1;
-      err = iterate_over_filelist (app, certid, 0, keygripstr, &i);
+      idx = -1;
+      err = iterate_over_filelist (app, certid, 0, keygripstr, &idx);
       if (err)
         return err;
 
-      if (filelist[i].iskeypair > 0)
-        fid = filelist[i].iskeypair;
-      else
-        fid = filelist[i].fid;
-
-      return readcert_from_ef (app, fid, cert, certlen);
+      /* Switching is not required here because iterate_over_filelist
+       * has already done that.  */
     }
+  else /* This is not a keygrip.  */
+    {
+      err = parse_keyref (app, certid, 0, &idx);
+      if (err)
+        return err;
 
-  if (!strncmp (certid, "NKS-NKS3.", 9))
-    nks_app_id = NKS_APP_NKS;
-  else if (!strncmp (certid, "NKS-ESIGN.", 10))
-    nks_app_id = NKS_APP_ESIGN;
-  else if (!strncmp (certid, "NKS-SIGG.", 9))
-    nks_app_id = NKS_APP_SIGG;
-  else if (!strncmp (certid, "NKS-DF01.", 9))
-    nks_app_id = NKS_APP_NKS;
-  else if (!strncmp (certid, "NKS-IDLM.", 9))
-    nks_app_id = NKS_APP_IDLM;
-  else
-    return gpg_error (GPG_ERR_INV_ID);
-  certid += nks_app_id == NKS_APP_ESIGN? 10 : 9;
-
-  err = switch_application (app, nks_app_id);
-  if (err)
-    return err;
-
-  if (!hexdigitp (certid) || !hexdigitp (certid+1)
-      || !hexdigitp (certid+2) || !hexdigitp (certid+3)
-      || certid[4])
-    return gpg_error (GPG_ERR_INV_ID);
-  fid = xtoi_4 (certid);
-  for (i=0; filelist[i].fid; i++)
-    if ((filelist[i].certtype || filelist[i].iskeypair > 0)
-        && filelist[i].nks_app_id == nks_app_id
-        && filelist[i].fid == fid)
-      break;
-  if (!filelist[i].fid)
-    return gpg_error (GPG_ERR_NOT_FOUND);
+      err = switch_application (app, filelist[idx].nks_app_id);
+      if (err)
+        return err;
+    }
 
   /* If the requested objects is a plain public key, redirect it to
      the corresponding certificate.  The whole system is a bit messy
      because we sometime use the key directly or let the caller
      retrieve the key from the certificate.  The rationale for
      that is to support not-yet stored certificates. */
-  if (filelist[i].iskeypair > 0)
-    fid = filelist[i].iskeypair;
+  if (filelist[idx].iskeypair > 0)
+    fid = filelist[idx].iskeypair;
+  else
+    fid = filelist[idx].fid;
 
   return readcert_from_ef (app, fid, cert, certlen);
 }
@@ -1265,7 +1280,7 @@ do_readkey (app_t app, ctrl_t ctrl, const char *keyid, unsigned int flags,
       xfree (buffer[0]);
       xfree (buffer[1]);
     }
-  else if (strlen (keyid) == 40)
+  else if (keyid[0] != 'N' && strlen (keyid) == 40)
     {
       char keygripstr[2*KEYGRIP_LEN+1];
       int i = -1;
@@ -1280,7 +1295,6 @@ do_readkey (app_t app, ctrl_t ctrl, const char *keyid, unsigned int flags,
         {
           char *algostr;
           char usagebuf[5];
-          int usageidx = 0;
           char id_buf[100];
 
           if (app_help_get_keygrip_string_pk (*pk, *pklen, NULL, NULL, NULL,
@@ -1290,15 +1304,7 @@ do_readkey (app_t app, ctrl_t ctrl, const char *keyid, unsigned int flags,
           snprintf (id_buf, sizeof id_buf, "NKS-%s.%04X",
                     get_nks_tag (app, filelist[i].nks_app_id),
                     filelist[i].fid);
-          if (filelist[i].issignkey)
-            usagebuf[usageidx++] = 's';
-          if (filelist[i].isauthkey)
-            usagebuf[usageidx++] = 'a';
-          if (filelist[i].isencrkey)
-            usagebuf[usageidx++] = 'e';
-          if (!usageidx)
-            usagebuf[usageidx++] = '-';
-          usagebuf[usageidx] = 0;
+          set_usage_string (usagebuf, i);
           send_status_info (ctrl, "KEYPAIRINFO",
                             keygripstr, strlen (keygripstr),
                             id_buf, strlen (id_buf),
@@ -1390,10 +1396,9 @@ do_writecert (app_t app, ctrl_t ctrl,
    * writecert it won't harm to flush the entire cache.  */
   flush_fid_cache (app);
 
-
   /* The certificates we support all require PW1.CH.  Note that we
    * check that the nks_app_id matches which sorts out CERTID values
-   * which are subkecy to a different nks_app_id.  */
+   * which are subkeys to a different nks_app_id.  */
   desc = parse_pwidstr (app, "PW1.CH", 0, &tmp_app_id, &pwid);
   if (!desc || tmp_app_id != nks_app_id)
     return gpg_error (GPG_ERR_INV_ID);
@@ -1401,7 +1406,7 @@ do_writecert (app_t app, ctrl_t ctrl,
   if (err)
     return err;
 
-    /* Select the file and write the certificate.  */
+  /* Select the file and write the certificate.  */
   err = iso7816_select_file (app_get_slot (app), fid, 0);
   if (err)
     {
@@ -1743,28 +1748,32 @@ do_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo,
   unsigned char data[83];   /* Must be large enough for a SHA-1 digest
                                + the largest OID prefix. */
   size_t datalen;
+  int algo;
+  unsigned int digestlen;   /* Length of the hash.  */
+  unsigned char oidbuf[64];
+  size_t oidbuflen;
 
   (void)ctrl;
 
   switch (indatalen)
     {
-    case 20: // plain SHA-1 or RMD160 digest
-    case 28: // plain SHA-224 digest
-    case 32: // plain SHA-256 digest
-    case 48: // plain SHA-384 digest
-    case 64: // plain SHA-512 digest
-    case 35: // ASN.1 encoded SHA-1 or RMD160 digest
-    case 47: // ASN.1 encoded SHA-224 digest
-    case 51: // ASN.1 encoded SHA-256 digest
-    case 67: // ASN.1 encoded SHA-384 digest
-    case 83: // ASN.1 encoded SHA-512 digest
-        break;
+    case 20: /* plain SHA-1 or RMD160 digest         */
+    case 28: /* plain SHA-224 digest                 */
+    case 32: /* plain SHA-256 digest                 */
+    case 48: /* plain SHA-384 digest                 */
+    case 64: /* plain SHA-512 digest                 */
+    case 35: /* ASN.1 encoded SHA-1 or RMD160 digest */
+    case 47: /* ASN.1 encoded SHA-224 digest         */
+    case 51: /* ASN.1 encoded SHA-256 digest         */
+    case 67: /* ASN.1 encoded SHA-384 digest         */
+    case 83: /* ASN.1 encoded SHA-512 digest         */
+      break;
     default:
-      log_debug ("invalid length of input data: %zu\n", indatalen);
+      log_info ("nks: invalid length of input data: %zu\n", indatalen);
       return gpg_error (GPG_ERR_INV_VALUE);
     }
 
-  err = find_fid_by_keyref (app, keyidstr, &idx, NULL);
+  err = find_fid_by_keyref (app, keyidstr, &idx, &algo);
   if (err)
     return err;
 
@@ -1783,12 +1792,57 @@ do_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo,
 
   kid = filelist[idx].kid;
 
-  /* Prepare the DER object from INDATA.  */
-  if (app->appversion > 2 && (indatalen == 35
-                              || indatalen == 47
-                              || indatalen == 51
-                              || indatalen == 67
-                              || indatalen == 83))
+  digestlen = gcry_md_get_algo_dlen (hashalgo);
+
+  /* Prepare the input object from INDATA.  */
+  if (algo == GCRY_PK_ECC)
+    {
+      if (digestlen != 32 && digestlen != 48 && digestlen != 64)
+        {
+          log_error ("nks: ECC signing not possible: dlen=%u\n", digestlen);
+          return gpg_error (GPG_ERR_DIGEST_ALGO);
+        }
+
+      if (indatalen == digestlen)
+        {
+          /* Already prepared.  */
+          datalen = indatalen;
+          log_assert (datalen <= sizeof data);
+          memcpy (data, indata, datalen);
+        }
+      else if (indatalen > digestlen)
+        {
+          /* Assume a PKCS#1 prefix and remove it.  */
+          oidbuflen = sizeof oidbuf;
+          err = gcry_md_get_asnoid (hashalgo, &oidbuf, &oidbuflen);
+          if (err)
+            {
+              log_error ("nks: no OID for hash algo %d\n", hashalgo);
+              return gpg_error (GPG_ERR_INTERNAL);
+            }
+          if (indatalen != oidbuflen + digestlen
+              || memcmp (indata, oidbuf, oidbuflen))
+            {
+              log_error ("nks: input data too long for ECC: len=%zu\n",
+                         indatalen);
+              return gpg_error (GPG_ERR_INV_VALUE);
+            }
+          datalen = indatalen - oidbuflen;
+          log_assert (datalen <= sizeof data);
+          memcpy (data, (const char*)indata + oidbuflen, datalen);
+        }
+      else
+        {
+          log_error ("nks: input data too short for ECC: len=%zu\n",
+                     indatalen);
+          return gpg_error (GPG_ERR_INV_VALUE);
+        }
+    }
+  else if (app->appversion > 2 && (indatalen == 35
+                                   || indatalen == 47
+                                   || indatalen == 51
+                                   || indatalen == 67
+                                   || indatalen == 83))
     {
       /* Verify that the caller has sent a proper ASN.1 encoded hash
          for RMD160 or SHA-{1,224,256,384,512}. */
@@ -1824,7 +1878,8 @@ do_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo,
       memcpy (data, indata, indatalen);
       datalen = 35;
     }
-  /* Concatenate prefix and digest.  */
+  /* Concatenate prefix and digest.
+   * Note that the X macro creates an "else if".  Ugly - I know. */
 #define X(algo,prefix,plaindigestlen) \
   if ((hashalgo == (algo)) && (indatalen == (plaindigestlen))) \
     {                                                          \
@@ -1844,7 +1899,7 @@ do_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo,
 #undef X
 
   /* Send an MSE for PSO:Computer_Signature.  */
-  if (app->appversion > 2)
+  if (app->appversion > 2 && app->app_local->active_nks_app != NKS_APP_ESIGN)
     {
       unsigned char mse[6];
 
@@ -1858,8 +1913,9 @@ do_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo,
                                          mse, sizeof mse);
     }
 
-  /* We use the Global PIN 1 */
-  if (app->appversion == 15)
+  if (app->app_local->active_nks_app == NKS_APP_ESIGN)
+    pwid = 0x81;
+  else if (app->appversion == 15)
     pwid = 0x03;
   else
     pwid = 0x00;
@@ -2333,22 +2389,13 @@ do_with_keygrip (app_t app, ctrl_t ctrl, int action,
       else
         {
           char idbuf[20];
-          const char *tagstr;
-
-          if (app->app_local->active_nks_app == NKS_APP_ESIGN)
-            tagstr = "ESIGN";
-          else if (app->app_local->active_nks_app == NKS_APP_SIGG)
-            tagstr = "SIGG";
-          else if (app->app_local->active_nks_app == NKS_APP_IDLM)
-            tagstr = "IDLM";
-          else if (app->appversion < 3)
-            tagstr = "DF01";
-          else
-            tagstr = "NKS3";
+          char usagebuf[5];
 
           snprintf (idbuf, sizeof idbuf, "NKS-%s.%04X",
-                    tagstr, filelist[idx].fid);
-          send_keyinfo (ctrl, data, keygripstr, serialno, idbuf);
+                    get_nks_tag (app, app->app_local->active_nks_app),
+                    filelist[idx].fid);
+          set_usage_string (usagebuf, idx);
+          send_keyinfo (ctrl, data, keygripstr, serialno, idbuf, usagebuf);
         }
     }
 
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 05e1f39..8bb346a 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -280,7 +280,7 @@ static gpg_error_t do_auth (app_t app, ctrl_t ctrl, const char *keyidstr,
                             unsigned char **outdata, size_t *outdatalen);
 static const char *get_algorithm_attribute_string (const unsigned char *buffer,
                                                    size_t buflen);
-static void parse_algorithm_attribute (app_t app, int keyno);
+static gpg_error_t parse_algorithm_attribute (app_t app, int keyno);
 static gpg_error_t change_keyattr_from_string
                            (app_t app, ctrl_t ctrl,
                             gpg_error_t (*pincb)(void*, const char *, char **),
@@ -321,6 +321,7 @@ get_manufacturer (unsigned int no)
     case 0x63AF: return "Trustica";
     case 0xBA53: return "c-base e.V.";
     case 0xBD0E: return "Paranoidlabs";
+    case 0xCA05: return "Atos CardOS";
     case 0xF1D0: return "CanoKeys";
     case 0xF517: return "FSIJ";
     case 0xF5EC: return "F-Secure";
@@ -423,7 +424,7 @@ get_cached_data (app_t app, int tag,
               {
                 p = xtrymalloc (c->length);
                 if (!p)
-                  return gpg_error (gpg_err_code_from_errno (errno));
+                  return gpg_error_from_syserror ();
                 memcpy (p, c->data, c->length);
                 *result = p;
               }
@@ -2042,6 +2043,21 @@ get_public_key (app_t app, int keyno)
 }
 
 
+static const char *
+get_usage_string (int keyno)
+{
+  const char *usage;
+  switch (keyno)
+    {
+    case 0: usage = "sc"; break;
+    case 1: usage = "e";  break;
+    case 2: usage = "sa"; break;
+    default: usage = "-";  break;
+    }
+  return usage;
+}
+
+
 /* Send the KEYPAIRINFO back. KEY needs to be in the range [1,3].
    This is used by the LEARN command. */
 static gpg_error_t
@@ -2061,13 +2077,7 @@ send_keypair_info (app_t app, ctrl_t ctrl, int key)
   if (!app->app_local->pk[keyno].key)
     goto leave; /* No such key - ignore. */
 
-  switch (keyno)
-    {
-    case 0: usage = "sc"; break;
-    case 1: usage = "e";  break;
-    case 2: usage = "sa"; break;
-    default: usage = "-";  break;
-    }
+  usage = get_usage_string (keyno);
 
   if (retrieve_fprtime_from_card (app, keyno, &fprtime))
     fprtime = 0;
@@ -2256,7 +2266,28 @@ do_readcert (app_t app, const char *certid,
 
   *cert = NULL;
   *certlen = 0;
-  if (!ascii_strcasecmp (certid, "OPENPGP.3"))
+  if (strlen (certid) == 40)
+    {
+      int keyno;
+      const unsigned char *keygrip_str;
+
+      for (keyno = 0; keyno < 3; keyno++)
+        {
+          keygrip_str = app->app_local->pk[keyno].keygrip_str;
+          if (!strncmp (keygrip_str, certid, 40))
+            break;
+        }
+
+      if (keyno == 2)
+        ;
+      else if (keyno == 1)
+        occurrence = 1;
+      else if (keyno == 0)
+        occurrence = 2;
+      else
+        return gpg_error (GPG_ERR_INV_ID);
+    }
+  else if (!ascii_strcasecmp (certid, "OPENPGP.3"))
     ;
   else if (!ascii_strcasecmp (certid, "OPENPGP.2"))
     occurrence = 1;
@@ -3939,7 +3970,7 @@ change_keyattr (app_t app, ctrl_t ctrl,
   else
     log_info ("key attribute of OPENPGP.%d changed\n", keyno+1);
   flush_cache (app);
-  parse_algorithm_attribute (app, keyno);
+  err = parse_algorithm_attribute (app, keyno);
   app->did_chv1 = 0;
   app->did_chv2 = 0;
   app->did_chv3 = 0;
@@ -5445,9 +5476,15 @@ do_auth (app_t app, ctrl_t ctrl, const char *keyidstr,
       goto indata_ready;
     }
 
-  if (app->app_local->keyattr[2].key_type == KEY_TYPE_RSA
-      && indatalen > 101) /* For a 2048 bit key. */
-    return gpg_error (GPG_ERR_INV_VALUE);
+  if (app->app_local->keyattr[2].key_type == KEY_TYPE_RSA)
+    {
+      int size_40percent = (app->app_local->keyattr[2].rsa.n_bits+7)/8 * 4;
+
+      /* OpenPGP card does PKCS#1 for RSA, data should not be larger
+         than 40% of the modulus length.  */
+      if (indatalen * 10 > size_40percent)
+        return gpg_error (GPG_ERR_INV_VALUE);
+    }
 
   if (app->app_local->keyattr[2].key_type == KEY_TYPE_ECC)
     {
@@ -5490,6 +5527,11 @@ do_auth (app_t app, ctrl_t ctrl, const char *keyidstr,
           exmode = 1;    /* Use extended length.  */
           le_value = app->app_local->keyattr[2].rsa.n_bits / 8;
         }
+      else if (app->app_local->cardcap.cmd_chaining && indatalen > 254)
+        {
+          exmode = -254; /* Command chaining with max. 254 bytes.  */
+          le_value = 0;
+        }
       else if (indatalen > 255)
         {
           if (!app->app_local->cardcap.ext_lc_le)
@@ -5908,12 +5950,13 @@ send_keyinfo_if_available (app_t app, ctrl_t ctrl, char *serial,
                            int data, int i)
 {
   char idbuf[50];
+  const char *usage = get_usage_string (i);
 
   if (app->app_local->pk[i].read_done)
     {
       sprintf (idbuf, "OPENPGP.%d", i+1);
       send_keyinfo (ctrl, data,
-                    app->app_local->pk[i].keygrip_str, serial, idbuf);
+                    app->app_local->pk[i].keygrip_str, serial, idbuf, usage);
     }
 }
 
@@ -6146,7 +6189,7 @@ get_algorithm_attribute_string (const unsigned char *buffer,
 
 /* Parse and optionally show the algorithm attributes for KEYNO.
    KEYNO must be in the range 0..2.  */
-static void
+static gpg_error_t
 parse_algorithm_attribute (app_t app, int keyno)
 {
   unsigned char *buffer;
@@ -6156,6 +6199,7 @@ parse_algorithm_attribute (app_t app, int keyno)
   enum gcry_pk_algos galgo;
   unsigned int nbits;
   const char *curve;
+  gpg_error_t err = 0;
 
   log_assert (keyno >=0 && keyno <= 2);
 
@@ -6166,13 +6210,13 @@ parse_algorithm_attribute (app_t app, int keyno)
   if (!relptr)
     {
       log_error ("error reading DO 0x%02X\n", 0xc1+keyno);
-      return;
+      return gpg_error (GPG_ERR_CARD);
     }
   if (buflen < 1)
     {
       log_error ("error reading DO 0x%02X\n", 0xc1+keyno);
       xfree (relptr);
-      return;
+      return gpg_error (GPG_ERR_CARD);
     }
 
   if (opt.verbose)
@@ -6215,7 +6259,8 @@ parse_algorithm_attribute (app_t app, int keyno)
       app->app_local->keyattr[keyno].ecc.algo = *buffer;
       app->app_local->keyattr[keyno].ecc.flags = 0;
 
-      if (buffer[buflen-1] == 0x00 || buffer[buflen-1] == 0xff)
+      if (APP_CARD(app)->cardtype == CARDTYPE_YUBIKEY
+	  || buffer[buflen-1] == 0x00 || buffer[buflen-1] == 0xff)
         { /* Found "pubkey required"-byte for private key template.  */
           oidlen--;
           if (buffer[buflen-1] == 0xff)
@@ -6225,7 +6270,10 @@ parse_algorithm_attribute (app_t app, int keyno)
       curve = ecc_curve (buffer + 1, oidlen);
 
       if (!curve)
-        log_printhex (buffer+1, buflen-1, "Curve with OID not supported: ");
+        {
+          log_printhex (buffer+1, buflen-1, "Curve with OID not supported: ");
+          err = gpg_error (GPG_ERR_CARD);
+        }
       else
         {
           app->app_local->keyattr[keyno].key_type = KEY_TYPE_ECC;
@@ -6255,6 +6303,7 @@ parse_algorithm_attribute (app_t app, int keyno)
               desc[keyno], app->app_local->keyattr[keyno].keyalgo);
 
   xfree (relptr);
+  return err;
 }
 
 
@@ -6325,16 +6374,16 @@ gpg_error_t
 app_select_openpgp (app_t app)
 {
   int slot = app_get_slot (app);
-  int rc;
+  gpg_error_t err;
   unsigned char *buffer;
   size_t buflen;
   void *relptr;
 
   /* Note that the card can't cope with P2=0xCO, thus we need to pass a
      special flag value. */
-  rc = iso7816_select_application (slot,
-                                   openpgp_aid, sizeof openpgp_aid, 0x0001);
-  if (!rc)
+  err = iso7816_select_application (slot,
+                                    openpgp_aid, sizeof openpgp_aid, 0x0001);
+  if (!err)
     {
       unsigned int manufacturer;
 
@@ -6350,8 +6399,8 @@ app_select_openpgp (app_t app)
          replace a possibly already set one from a EF.GDO with this
          one.  Note, that for current OpenPGP cards, no EF.GDO exists
          and thus it won't matter at all. */
-      rc = iso7816_get_data (slot, 0, 0x004F, &buffer, &buflen);
-      if (rc)
+      err = iso7816_get_data (slot, 0, 0x004F, &buffer, &buflen);
+      if (err)
         goto leave;
       if (opt.verbose)
         {
@@ -6385,7 +6434,7 @@ app_select_openpgp (app_t app)
       app->app_local = xtrycalloc (1, sizeof *app->app_local);
       if (!app->app_local)
         {
-          rc = gpg_error (gpg_err_code_from_errno (errno));
+          err = gpg_error_from_syserror ();
           goto leave;
         }
 
@@ -6419,6 +6468,7 @@ app_select_openpgp (app_t app)
         {
           log_error (_("can't access %s - invalid OpenPGP card?\n"),
                      "CHV Status Bytes");
+          err = gpg_error (GPG_ERR_CARD);
           goto leave;
         }
       app->force_chv1 = (buflen && *buffer == 0);
@@ -6430,6 +6480,7 @@ app_select_openpgp (app_t app)
         {
           log_error (_("can't access %s - invalid OpenPGP card?\n"),
                      "Extended Capability Flags" );
+          err = gpg_error (GPG_ERR_CARD);
           goto leave;
         }
       if (buflen)
@@ -6480,9 +6531,13 @@ app_select_openpgp (app_t app)
       if (opt.verbose)
         show_caps (app->app_local);
 
-      parse_algorithm_attribute (app, 0);
-      parse_algorithm_attribute (app, 1);
-      parse_algorithm_attribute (app, 2);
+      err = parse_algorithm_attribute (app, 0);
+      if (!err)
+        err = parse_algorithm_attribute (app, 1);
+      if (!err)
+        err = parse_algorithm_attribute (app, 2);
+      if (err)
+        goto leave;
 
       if (opt.verbose > 1)
         dump_all_do (slot);
@@ -6511,7 +6566,7 @@ app_select_openpgp (app_t app)
    }
 
 leave:
-  if (rc)
+  if (err)
     do_deinit (app);
-  return rc;
+  return err;
 }
diff --git a/scd/app-p15.c b/scd/app-p15.c
index 7f838ff..5310af8 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -481,7 +481,7 @@ struct app_local_s
     unsigned short auth_objects;
   } odf;
 
-  /* The PKCS#15 serialnumber from EF(TokeiNFo) or NULL.  Malloced. */
+  /* The PKCS#15 serialnumber from EF(TokenInfo) or NULL.  Malloced. */
   unsigned char *serialno;
   size_t serialnolen;
 
@@ -3578,14 +3578,10 @@ read_p15_info (app_t app)
 
   if (IS_CARDOS_5 (app)
       && app->app_local->manufacturer_id
-      && !ascii_strcasecmp (app->app_local->manufacturer_id, "GeNUA mbH")
-      && !app->app_local->no_extended_mode)
+      && !ascii_strcasecmp (app->app_local->manufacturer_id, "GeNUA mbH"))
     {
       if (!app->app_local->card_product)
         app->app_local->card_product = CARD_PRODUCT_GENUA;
-      if (opt.verbose)
-        log_info ("p15: disabling extended mode based on TokenInfo\n");
-      app->app_local->no_extended_mode = 1;
     }
 
   /* Read the ODF so that we know the location of all directory
@@ -4114,6 +4110,47 @@ keyref_from_prkdf (app_t app, prkdf_object_t prkdf)
 }
 
 
+static void
+set_usage_string (char usage[5], prkdf_object_t prkdf)
+{
+  size_t usagelen = 0;
+  if (prkdf->gpgusage.any)
+    {
+      if (prkdf->gpgusage.sign)
+        usage[usagelen++] = 's';
+      if (prkdf->gpgusage.cert)
+        usage[usagelen++] = 'c';
+      if (prkdf->gpgusage.encr)
+        usage[usagelen++] = 'e';
+      if (prkdf->gpgusage.auth)
+        usage[usagelen++] = 'a';
+    }
+  else
+    {
+      if ((prkdf->usageflags.sign
+           || prkdf->usageflags.sign_recover
+           || prkdf->usageflags.non_repudiation)
+          && (!prkdf->extusage.valid
+              || prkdf->extusage.sign))
+        usage[usagelen++] = 's';
+      if ((prkdf->usageflags.sign
+           || prkdf->usageflags.sign_recover)
+          && (!prkdf->extusage.valid || prkdf->extusage.sign))
+        usage[usagelen++] = 'c';
+      if ((prkdf->usageflags.decrypt
+           || prkdf->usageflags.unwrap)
+          && (!prkdf->extusage.valid || prkdf->extusage.encr))
+        usage[usagelen++] = 'e';
+      if ((prkdf->usageflags.sign
+           || prkdf->usageflags.sign_recover)
+          && (!prkdf->extusage.valid || prkdf->extusage.auth))
+        usage[usagelen++] = 'a';
+    }
+  if (!usagelen)
+    usage[usagelen++] = '-';
+  usage[usagelen++] = 0;
+}
+
 /* Helper to do_learn_status: Send information about all known
    keypairs back.  FIXME: much code duplication from
    send_certinfo(). */
@@ -4144,40 +4181,6 @@ send_keypairinfo (app_t app, ctrl_t ctrl, prkdf_object_t prkdf)
           char usage[5];
           char keytime[20];
           const char *algostr;
-          size_t usagelen = 0;
-
-          if (prkdf->gpgusage.any)
-            {
-              if (prkdf->gpgusage.sign)
-                usage[usagelen++] = 's';
-              if (prkdf->gpgusage.cert)
-                usage[usagelen++] = 'c';
-              if (prkdf->gpgusage.encr)
-                usage[usagelen++] = 'e';
-              if (prkdf->gpgusage.auth)
-                usage[usagelen++] = 'a';
-            }
-          else
-            {
-              if ((prkdf->usageflags.sign
-                   || prkdf->usageflags.sign_recover
-                   || prkdf->usageflags.non_repudiation)
-                  && (!prkdf->extusage.valid
-                      || prkdf->extusage.sign))
-                usage[usagelen++] = 's';
-              if ((prkdf->usageflags.sign
-                   || prkdf->usageflags.sign_recover)
-                  && (!prkdf->extusage.valid || prkdf->extusage.sign))
-                usage[usagelen++] = 'c';
-              if ((prkdf->usageflags.decrypt
-                   || prkdf->usageflags.unwrap)
-                  && (!prkdf->extusage.valid || prkdf->extusage.encr))
-                usage[usagelen++] = 'e';
-              if ((prkdf->usageflags.sign
-                   || prkdf->usageflags.sign_recover)
-                  && (!prkdf->extusage.valid || prkdf->extusage.auth))
-                usage[usagelen++] = 'a';
-            }
 
           log_assert (strlen (prkdf->keygrip) == 40);
           if (prkdf->keytime && prkdf->have_keytime)
@@ -4188,10 +4191,11 @@ send_keypairinfo (app_t app, ctrl_t ctrl, prkdf_object_t prkdf)
 
           algostr = prkdf->keyalgostr;
 
+          set_usage_string (usage, prkdf);
           send_status_info (ctrl, "KEYPAIRINFO",
                             prkdf->keygrip, 2*KEYGRIP_LEN,
                             buf, strlen (buf),
-                            usage, usagelen,
+                            usage, strlen (usage),
                             keytime, strlen (keytime),
                             algostr, strlen (algostr?algostr:""),
                             NULL, (size_t)0);
@@ -4292,6 +4296,27 @@ readcert_by_cdf (app_t app, cdf_object_t cdf,
       return 0;
     }
 
+  if (DBG_CARD)
+    {
+      log_info ("p15: Reading CDF: id=");
+      for (i=0; i < cdf->objidlen; i++)
+        log_printf ("%02X", cdf->objid[i]);
+      if (cdf->label)
+        log_printf (" (%s)", cdf->label);
+      log_info ("p15:             path=");
+      for (i=0; i < cdf->pathlen; i++)
+        log_printf ("%s%04hX", i?"/":"", cdf->path[i]);
+      if (cdf->have_off)
+        log_printf ("[%lu/%lu]", cdf->off, cdf->len);
+      if (cdf->authid)
+        {
+          log_printf (" authid=");
+          for (i=0; i < cdf->authidlen; i++)
+            log_printf ("%02X", cdf->authid[i]);
+        }
+      log_printf ("\n");
+    }
+
   /* Read the entire file.  fixme: This could be optimized by first
      reading the header to figure out how long the certificate
      actually is. */
@@ -4299,7 +4324,7 @@ readcert_by_cdf (app_t app, cdf_object_t cdf,
   if (err)
     goto leave;
 
-  if (app->app_local->no_extended_mode)
+  if (app->app_local->no_extended_mode || !cdf->len)
     err = iso7816_read_binary_ext (app_get_slot (app), 0, cdf->off, 0,
                                    &buffer, &buflen, NULL);
   else
@@ -4986,7 +5011,18 @@ any_control_or_space (const char *string)
 {
   const unsigned char *s;
 
-  for (s = string; *string; string++)
+  for (s = string; *s; s++)
+    if (*s <= 0x20 || *s >= 0x7f)
+      return 1;
+  return 0;
+}
+
+static int
+any_control_or_space_mem (const void *buffer, size_t buflen)
+{
+  const unsigned char *s;
+
+  for (s = buffer; buflen; s++, buflen--)
     if (*s <= 0x20 || *s >= 0x7f)
       return 1;
   return 0;
@@ -4999,11 +5035,14 @@ static char *
 get_dispserialno (app_t app, prkdf_object_t prkdf)
 {
   char *serial;
+  const unsigned char *s;
+  int i;
   size_t n;
 
   /* We prefer the SerialNumber RDN from the Subject-DN but we don't
    * use it if it features a percent sign (special character in pin
-   * prompts) or has any control character.  */
+   * prompts) or has any control character.  For some cards we use a
+   * different strategy.  */
   if (app->app_local->card_product == CARD_PRODUCT_RSCS)
     {
       /* We use only the right 8 hex digits.  */
@@ -5011,6 +5050,28 @@ get_dispserialno (app_t app, prkdf_object_t prkdf)
       if (serial && (n=strlen (serial)) > 8)
         memmove (serial, serial + n - 8, 9);
     }
+  else if (IS_CARDOS_5 (app) && app->app_local->manufacturer_id
+           && !ascii_strcasecmp (app->app_local->manufacturer_id,
+                                 "Technology Nexus")
+           && APP_CARD(app)->serialno && APP_CARD(app)->serialnolen == 4+9
+           && !memcmp (APP_CARD(app)->serialno, "\xff\x00\x00\xff", 4)
+           && !any_control_or_space_mem (APP_CARD(app)->serialno + 4, 9))
+    {
+      /* Sample: ff0000ff354830313232363537 -> "5H01 2265 7" */
+      serial = xtrymalloc (9+2+1);
+      if (serial)
+        {
+          s = APP_CARD(app)->serialno + 4;
+          for (i=0; i < 4; i++)
+            serial[i] = *s++;
+          serial[i++] = ' ';
+          for (; i < 9; i++)
+            serial[i] = *s++;
+          serial[i++] = ' ';
+          serial[i++] = *s;
+          serial[i] = 0;
+        }
+    }
   else if (prkdf && prkdf->serial_number && *prkdf->serial_number
       && !strchr (prkdf->serial_number, '%')
       && !any_control_or_space (prkdf->serial_number))
@@ -5021,6 +5082,7 @@ get_dispserialno (app_t app, prkdf_object_t prkdf)
     {
       serial = app_get_serialno (app);
     }
+
   return serial;
 }
 
@@ -5133,8 +5195,8 @@ verify_pin (app_t app,
     {
       /* We know that this card supports a verify status check.  Note
        * that in contrast to PIV cards ISO7816_VERIFY_NOT_NEEDED is
-       * not supported.  Noet that we don't use the pin_verified cache
-       * status because that is not as reliable than to ask the card
+       * not supported.  We also don't use the pin_verified cache
+       * status because that is not as reliable as to ask the card
        * about its state.  */
       if (prkdf)  /* Clear the cache which we don't use.  */
         prkdf->pin_verified = 0;
@@ -5963,6 +6025,7 @@ do_with_keygrip (app_t app, ctrl_t ctrl, int action,
       else if (!want_keygripstr || !strcmp (prkdf->keygrip, want_keygripstr))
         {
           char *keyref;
+          char usage[5];
 
           if (capability == GCRY_PK_USAGE_SIGN)
             {
@@ -5988,7 +6051,8 @@ do_with_keygrip (app_t app, ctrl_t ctrl, int action,
               goto leave;
             }
 
-          send_keyinfo (ctrl, as_data, prkdf->keygrip, serialno, keyref);
+          set_usage_string (usage, prkdf);
+          send_keyinfo (ctrl, as_data, prkdf->keygrip, serialno, keyref, usage);
           xfree (keyref);
           if (want_keygripstr)
             {
diff --git a/scd/app-piv.c b/scd/app-piv.c
index 33b0150..a51ac31 100644
--- a/scd/app-piv.c
+++ b/scd/app-piv.c
@@ -1516,7 +1516,7 @@ do_readkey (app_t app, ctrl_t ctrl, const char *keyrefstr, unsigned int flags,
                      gpg_strerror (err));
           goto leave;
         }
-      usage = dobj->usage? dobj->usage : "";
+      usage = dobj->usage? dobj->usage : "-";
 
       snprintf (idbuf, sizeof idbuf, "PIV.%s", dobj->keyref);
       send_status_info (ctrl, "KEYPAIRINFO",
@@ -3529,6 +3529,13 @@ do_with_keygrip (app_t app, ctrl_t ctrl, int action,
         }
       else if (!want_keygripstr || !strcmp (keygripstr, want_keygripstr))
         {
+          const char *usage;
+
+          if (data_objects[i].usage)
+            usage = data_objects[i].usage;
+          else
+            usage = "-";
+
           if (capability == GCRY_PK_USAGE_SIGN)
             {
               if (strcmp (data_objects[i].keyref, "9C"))
@@ -3546,7 +3553,7 @@ do_with_keygrip (app_t app, ctrl_t ctrl, int action,
             }
 
           snprintf (idbuf, sizeof idbuf, "PIV.%s", data_objects[i].keyref);
-          send_keyinfo (ctrl, data, keygripstr, serialno, idbuf);
+          send_keyinfo (ctrl, data, keygripstr, serialno, idbuf, usage);
           if (want_keygripstr)
             {
               err = 0; /* Found */
diff --git a/scd/command.c b/scd/command.c
index bc2e1f9..0f0c6c9 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -538,13 +538,19 @@ cmd_learn (assuan_context_t ctx, char *line)
   int only_keypairinfo = has_option (line, "--keypairinfo");
   int opt_multi = has_option (line, "--multi");
   int opt_reread = has_option (line, "--reread");
+  int opt_force = has_option (line, "--force");
   unsigned int flags;
   card_t card;
+  const char *keygrip = NULL;
 
   if ((rc = open_card (ctrl)))
     return rc;
 
-  card = card_get (ctrl, NULL);
+  line = skip_options (line);
+  if (strlen (line) == 40)
+    keygrip = line;
+
+  card = card_get (ctrl, keygrip);
   if (!card)
     return gpg_error (GPG_ERR_CARD_NOT_PRESENT);
 
@@ -581,7 +587,7 @@ cmd_learn (assuan_context_t ctx, char *line)
           return out_of_core ();
         }
 
-      if (!has_option (line, "--force"))
+      if (!opt_force)
         {
           char *command;
 
@@ -639,6 +645,7 @@ cmd_readcert (assuan_context_t ctx, char *line)
   unsigned char *cert;
   size_t ncert;
   card_t card;
+  const char *keygrip = NULL;
 
   if ((rc = open_card (ctrl)))
     return rc;
@@ -647,7 +654,10 @@ cmd_readcert (assuan_context_t ctx, char *line)
   if (!line)
     return gpg_error_from_syserror ();
 
-  card = card_get (ctrl, NULL);
+  if (strlen (line) == 40)
+    keygrip = line;
+
+  card = card_get (ctrl, keygrip);
   if (!card)
     {
       xfree (line);
@@ -974,7 +984,9 @@ pin_cb (void *opaque, const char *info, char **retstr)
 
   /* Fixme: Write an inquire function which returns the result in
      secure memory and check all further handling of the PIN. */
+  assuan_begin_confidential (ctx);
   rc = assuan_inquire (ctx, command, &value, &valuelen, MAXLEN_PIN);
+  assuan_end_confidential (ctx);
   xfree (command);
   if (rc)
     return rc;
@@ -2229,7 +2241,7 @@ static const char hlp_keyinfo[] =
   "Unless --data is given, the\n"
   "information is returned as a status line using the format:\n"
   "\n"
-  "  KEYINFO <keygrip> T <serialno> <idstr>\n"
+  "  KEYINFO <keygrip> T <serialno> <idstr> <usage>\n"
   "\n"
   "KEYGRIP is the keygrip.\n"
   "\n"
@@ -2237,9 +2249,13 @@ static const char hlp_keyinfo[] =
   "         smartcard.  If the serial number is not known a single\n"
   "         dash '-' is used instead.\n"
   "\n"
-  "IDSTR is the IDSTR used to distinguish keys on a smartcard.  If it\n"
+  "IDSTR is a string used to distinguish keys on a smartcard.  If it\n"
   "      is not known a dash is used instead.\n"
   "\n"
+  "USAGE is a string of capabilities of the key, 's' for sign, \n"
+  "'e' for encryption, 'a' for auth, and 'c' for cert.  If it is not\n"
+  "known a dash is used instead.\n"
+  "\n"
   "More information may be added in the future.";
 static gpg_error_t
 cmd_keyinfo (assuan_context_t ctx, char *line)
@@ -2284,14 +2300,15 @@ cmd_keyinfo (assuan_context_t ctx, char *line)
  * line.  */
 void
 send_keyinfo (ctrl_t ctrl, int data, const char *keygrip_str,
-              const char *serialno, const char *idstr)
+              const char *serialno, const char *idstr, const char *usage)
 {
   char *string;
   assuan_context_t ctx = ctrl->server_local->assuan_ctx;
 
-  string = xtryasprintf ("%s T %s %s%s", keygrip_str,
+  string = xtryasprintf ("%s T %s %s %s%s", keygrip_str,
                          serialno? serialno : "-",
                          idstr? idstr : "-",
+                         usage? usage : "-",
                          data? "\n" : "");
 
   if (!string)
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 83f2457..6d068d3 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -194,6 +194,7 @@ static struct debug_flags_s debug_flags [] =
     { DBG_MEMSTAT_VALUE, "memstat" },
     { DBG_HASHING_VALUE, "hashing" },
     { DBG_IPC_VALUE    , "ipc"     },
+    { DBG_CARD_VALUE   , "card"    },
     { DBG_CARD_IO_VALUE, "cardio"  },
     { DBG_READER_VALUE , "reader"  },
     { DBG_APP_VALUE    , "app"     },
diff --git a/scd/scdaemon.h b/scd/scdaemon.h
index 071960c..68136b8 100644
--- a/scd/scdaemon.h
+++ b/scd/scdaemon.h
@@ -69,15 +69,16 @@ struct
 } opt;
 
 
-#define DBG_APP_VALUE     1     /* Debug app speific stuff.  */
+#define DBG_APP_VALUE     1     /* Debug app specific stuff.  */
 #define DBG_MPI_VALUE	  2	/* debug mpi details */
 #define DBG_CRYPTO_VALUE  4	/* debug low level crypto */
+#define DBG_CARD_VALUE    16    /* debug card info  */
 #define DBG_MEMORY_VALUE  32	/* debug memory allocation stuff */
 #define DBG_CACHE_VALUE   64	/* debug the caching */
 #define DBG_MEMSTAT_VALUE 128	/* show memory statistics */
 #define DBG_HASHING_VALUE 512	/* debug hashing operations */
 #define DBG_IPC_VALUE     1024
-#define DBG_CARD_IO_VALUE 2048
+#define DBG_CARD_IO_VALUE 2048  /* debug card I/O (e.g. APDUs).  */
 #define DBG_READER_VALUE  4096  /* Trace reader related functions.  */
 
 #define DBG_APP     (opt.debug & DBG_APP_VALUE)
@@ -86,6 +87,7 @@ struct
 #define DBG_CACHE   (opt.debug & DBG_CACHE_VALUE)
 #define DBG_HASHING (opt.debug & DBG_HASHING_VALUE)
 #define DBG_IPC     (opt.debug & DBG_IPC_VALUE)
+#define DBG_CARD    (opt.debug & DBG_CARD_VALUE)
 #define DBG_CARD_IO (opt.debug & DBG_CARD_IO_VALUE)
 #define DBG_READER  (opt.debug & DBG_READER_VALUE)
 
@@ -138,7 +140,8 @@ gpg_error_t send_status_direct (ctrl_t ctrl,
 gpg_error_t send_status_printf (ctrl_t ctrl, const char *keyword,
                                 const char *format, ...) GPGRT_ATTR_PRINTF(3,4);
 void send_keyinfo (ctrl_t ctrl, int data, const char *keygrip_str,
-                   const char *serialno, const char *idstr);
+                   const char *serialno, const char *idstr,
+                   const char *usage);
 
 void pincache_put (ctrl_t ctrl, int slot, const char *appname,
                    const char *pinref, const char *pin, unsigned int pinlen);
diff --git a/sm/certlist.c b/sm/certlist.c
index 5ce7458..f06a23f 100644
--- a/sm/certlist.c
+++ b/sm/certlist.c
@@ -51,9 +51,11 @@ cert_usage_p (ksba_cert_t cert, int mode, int silent)
 {
   gpg_error_t err;
   unsigned int use;
+  unsigned int encr_bits, sign_bits;
   char *extkeyusages;
   int have_ocsp_signing = 0;
 
+
   err = ksba_cert_get_ext_key_usages (cert, &extkeyusages);
   if (gpg_err_code (err) == GPG_ERR_NO_DATA)
     err = 0; /* no policy given */
@@ -157,10 +159,13 @@ cert_usage_p (ksba_cert_t cert, int mode, int silent)
       return gpg_error (GPG_ERR_WRONG_KEY_USAGE);
     }
 
-  if ((use & ((mode&1)?
-              (KSBA_KEYUSAGE_KEY_ENCIPHERMENT|KSBA_KEYUSAGE_DATA_ENCIPHERMENT):
-              (KSBA_KEYUSAGE_DIGITAL_SIGNATURE|KSBA_KEYUSAGE_NON_REPUDIATION)))
-      )
+  encr_bits = (KSBA_KEYUSAGE_KEY_ENCIPHERMENT|KSBA_KEYUSAGE_DATA_ENCIPHERMENT);
+  if ((opt.compat_flags & COMPAT_ALLOW_KA_TO_ENCR))
+    encr_bits |= KSBA_KEYUSAGE_KEY_AGREEMENT;
+
+  sign_bits = (KSBA_KEYUSAGE_DIGITAL_SIGNATURE|KSBA_KEYUSAGE_NON_REPUDIATION);
+
+  if ((use & ((mode&1)? encr_bits : sign_bits)))
     return 0;
 
   if (!silent)
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 4634fba..4c7c28c 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -210,6 +210,7 @@ enum cmd_and_opt_values {
   oUseKeyboxd,
   oKeyboxdProgram,
   oRequireCompliance,
+  oCompatibilityFlags,
   oNoAutostart
  };
 
@@ -442,6 +443,7 @@ static gpgrt_opt_t opts[] = {
   ARGPARSE_s_s (oLCmessages, "lc-messages", "@"),
   ARGPARSE_s_s (oXauthority, "xauthority", "@"),
   ARGPARSE_s_s (oChUid, "chuid", "@"),
+  ARGPARSE_s_s (oCompatibilityFlags, "compatibility-flags", "@"),
 
   ARGPARSE_header (NULL, ""),  /* Stop the header group.  */
 
@@ -479,6 +481,14 @@ static struct debug_flags_s debug_flags [] =
   };
 
 
+/* The list of compatibility flags.  */
+static struct compatibility_flags_s compatibility_flags [] =
+  {
+    { COMPAT_ALLOW_KA_TO_ENCR, "allow-ka-to-encr" },
+    { 0, NULL }
+  };
+
+
 /* Global variable to keep an error count. */
 int gpgsm_errors_seen = 0;
 
@@ -1271,6 +1281,15 @@ main ( int argc, char **argv)
         case oDebugIgnoreExpiration: opt.ignore_expiration = 1; break;
         case oDebugForceECDHSHA1KDF: opt.force_ecdh_sha1kdf = 1; break;
 
+        case oCompatibilityFlags:
+          if (parse_compatibility_flags (pargs.r.ret_str, &opt.compat_flags,
+                                         compatibility_flags))
+            {
+              pargs.r_opt = ARGPARSE_INVALID_ARG;
+              pargs.err = ARGPARSE_PRINT_ERROR;
+            }
+          break;
+
         case oStatusFD:
             ctrl.status_fd = translate_sys2libc_fd_int (pargs.r.ret_int, 1);
             break;
@@ -1584,6 +1603,8 @@ main ( int argc, char **argv)
   gcry_control (GCRYCTL_RESUME_SECMEM_WARN);
 
   set_debug ();
+  if (opt.verbose) /* Print the compatibility flags.  */
+    parse_compatibility_flags (NULL, &opt.compat_flags, compatibility_flags);
   gnupg_set_compliance_extra_info (opt.min_rsa_length);
 
   /* Although we always use gpgsm_exit, we better install a regular
diff --git a/sm/gpgsm.h b/sm/gpgsm.h
index bb32db3..8765f9f 100644
--- a/sm/gpgsm.h
+++ b/sm/gpgsm.h
@@ -176,6 +176,9 @@ struct
    * HEX_OR_FILENAME.  The actual value needs to be encoded as a SET OF
    * attribute values.  */
   strlist_t attributes;
+
+  /* Compatibility flags (COMPAT_FLAG_xxxx).  */
+  unsigned int compat_flags;
 } opt;
 
 /* Debug values and macros.  */
@@ -199,6 +202,18 @@ struct
 #define DBG_CLOCK   (opt.debug & DBG_CLOCK_VALUE)
 #define DBG_LOOKUP  (opt.debug & DBG_LOOKUP_VALUE)
 
+
+/* Compatibility flags */
+/* Telesec RSA cards produced for NRW in 2022 came with only the
+ * keyAgreement bit set.  This flag allows there use for encryption
+ * anyway.  Example cert:
+ *    Issuer: /CN=DOI CA 10a/OU=DOI/O=PKI-1-Verwaltung/C=DE
+ * key usage: digitalSignature nonRepudiation keyAgreement
+ *  policies: 1.3.6.1.4.1.7924.1.1:N:
+ */
+#define COMPAT_ALLOW_KA_TO_ENCR   1
+
+
 /* Forward declaration for an object defined in server.c */
 struct server_local_s;
 
diff --git a/sm/keylist.c b/sm/keylist.c
index 404eca1..9e2c79c 100644
--- a/sm/keylist.c
+++ b/sm/keylist.c
@@ -304,9 +304,11 @@ print_capabilities (ksba_cert_t cert, estream_t fp)
 {
   gpg_error_t err;
   unsigned int use;
+  unsigned int is_encr, is_sign, is_cert;
   size_t buflen;
   char buffer[1];
 
+
   err = ksba_cert_get_user_data (cert, "is_qualified",
                                  &buffer, sizeof (buffer), &buflen);
   if (!err && buflen)
@@ -338,17 +340,33 @@ print_capabilities (ksba_cert_t cert, estream_t fp)
       return;
     }
 
+  is_encr = is_sign = is_cert = 0;
+
   if ((use & (KSBA_KEYUSAGE_KEY_ENCIPHERMENT|KSBA_KEYUSAGE_DATA_ENCIPHERMENT)))
-    es_putc ('e', fp);
+    is_encr = 1;
   if ((use & (KSBA_KEYUSAGE_DIGITAL_SIGNATURE|KSBA_KEYUSAGE_NON_REPUDIATION)))
-    es_putc ('s', fp);
+    is_sign = 1;
   if ((use & KSBA_KEYUSAGE_KEY_CERT_SIGN))
+    is_cert = 1;
+
+  /* We need to returned the faked key usage to frontends so that they
+   * can select the right key.  Note that we don't do this for the
+   * human readable keyUsage.  */
+  if ((opt.compat_flags & COMPAT_ALLOW_KA_TO_ENCR)
+      && (use & KSBA_KEYUSAGE_KEY_AGREEMENT))
+    is_encr = 1;
+
+  if (is_encr)
+    es_putc ('e', fp);
+  if (is_sign)
+    es_putc ('s', fp);
+  if (is_cert)
     es_putc ('c', fp);
-  if ((use & (KSBA_KEYUSAGE_KEY_ENCIPHERMENT|KSBA_KEYUSAGE_DATA_ENCIPHERMENT)))
+  if (is_encr)
     es_putc ('E', fp);
-  if ((use & (KSBA_KEYUSAGE_DIGITAL_SIGNATURE|KSBA_KEYUSAGE_NON_REPUDIATION)))
+  if (is_sign)
     es_putc ('S', fp);
-  if ((use & KSBA_KEYUSAGE_KEY_CERT_SIGN))
+  if (is_cert)
     es_putc ('C', fp);
 }
 
diff --git a/sm/minip12.c b/sm/minip12.c
index 801bd96..ad29fc2 100644
--- a/sm/minip12.c
+++ b/sm/minip12.c
@@ -1,6 +1,7 @@
 /* minip12.c - A minimal pkcs-12 implementation.
  * Copyright (C) 2002, 2003, 2004, 2006, 2011 Free Software Foundation, Inc.
  * Copyright (C) 2014 Werner Koch
+ * Copyright (C) 2022 g10 Code GmbH
  *
  * This file is part of GnuPG.
  *
@@ -16,6 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
 /* References:
@@ -141,6 +143,26 @@ struct tag_info
   int ndef;              /* It is an indefinite length */
 };
 
+/* Parser communication object.  */
+struct p12_parse_ctx_s
+{
+  /* The callback for parsed certificates and its arg.  */
+  void (*certcb)(void*, const unsigned char*, size_t);
+  void *certcbarg;
+
+  /* The supplied parseword.  */
+  const char *password;
+
+  /* Set to true if the password was wrong.  */
+  int badpass;
+
+  /* Malloced name of the curve.  */
+  char *curve;
+
+  /* The private key as an MPI array.   */
+  gcry_mpi_t *privatekey;
+};
+
 
 static int opt_verbose;
 
@@ -152,6 +174,16 @@ p12_set_verbosity (int verbose)
 }
 
 
+/* static void */
+/* dump_tag_info (struct tag_info *ti) */
+/* { */
+/*   log_debug ("p12_parse: ti.class=%d tag=%lu len=%lu nhdr=%d %s%s\n", */
+/*              ti->class, ti->tag, ti->length, ti->nhdr, */
+/*              ti->is_constructed?" cons":"", */
+/*              ti->ndef?" ndef":""); */
+/* } */
+
+
 /* Wrapper around tlv_builder_add_ptr to add an OID.  When we
  * eventually put the whole tlv_builder stuff into Libksba, we can add
  * such a function there.  Right now we don't do this to avoid a
@@ -727,14 +759,11 @@ bag_decrypted_data_p (const void *plaintext, size_t length)
   return 1;
 }
 
-/* Note: If R_RESULT is passed as NULL, a key object as already be
-   processed and thus we need to skip it here. */
+
 static int
-parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
-                          int startoffset, size_t *r_consumed, const char *pw,
-                          void (*certcb)(void*, const unsigned char*, size_t),
-                          void *certcbarg, gcry_mpi_t **r_result,
-                          int *r_badpass)
+parse_bag_encrypted_data (struct p12_parse_ctx_s *ctx,
+                          const unsigned char *buffer, size_t length,
+                          int startoffset, size_t *r_consumed)
 {
   struct tag_info ti;
   const unsigned char *p = buffer;
@@ -746,16 +775,12 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
   char iv[16];
   unsigned int iter;
   unsigned char *plain = NULL;
-  int bad_pass = 0;
   unsigned char *cram_buffer = NULL;
   size_t consumed = 0; /* Number of bytes consumed from the original buffer. */
   int is_3des = 0;
   int is_pbes2 = 0;
-  gcry_mpi_t *result = NULL;
-  int result_count;
+  int keyelem_count;
 
-  if (r_result)
-    *r_result = NULL;
   where = "start";
   if (parse_tag (&p, &n, &ti))
     goto bailout;
@@ -930,7 +955,7 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
       p = p_start = cram_buffer;
       if (r_consumed)
         *r_consumed = consumed;
-      r_consumed = NULL; /* Ugly hack to not update that value any further. */
+      r_consumed = NULL; /* Donot update that value on return. */
       ti.length = n;
     }
   else if (ti.class == CLASS_CONTEXT && ti.tag == 0 && ti.is_constructed)
@@ -943,7 +968,7 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
       p = p_start = cram_buffer;
       if (r_consumed)
         *r_consumed = consumed;
-      r_consumed = NULL; /* Ugly hack to not update that value any further. */
+      r_consumed = NULL; /* Do not update that value on return. */
       ti.length = n;
     }
   else if (ti.class == CLASS_CONTEXT && ti.tag == 0 && ti.length )
@@ -962,7 +987,7 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
       goto bailout;
     }
   decrypt_block (p, plain, ti.length, salt, saltlen, iter,
-                 iv, is_pbes2?16:0, pw,
+                 iv, is_pbes2?16:0, ctx->password,
                  is_pbes2 ? GCRY_CIPHER_AES128 :
                  is_3des  ? GCRY_CIPHER_3DES : GCRY_CIPHER_RFC2268_40,
                  bag_decrypted_data_p);
@@ -973,18 +998,18 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
   where = "outer.outer.seq";
   if (parse_tag (&p, &n, &ti))
     {
-      bad_pass = 1;
+      ctx->badpass = 1;
       goto bailout;
     }
   if (ti.class || ti.tag != TAG_SEQUENCE)
     {
-      bad_pass = 1;
+      ctx->badpass = 1;
       goto bailout;
     }
 
   if (parse_tag (&p, &n, &ti))
     {
-      bad_pass = 1;
+      ctx->badpass = 1;
       goto bailout;
     }
 
@@ -1040,7 +1065,7 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
           p += ti.length;
           n -= ti.length;
         }
-      else if (iskeybag && (result || !r_result))
+      else if (iskeybag && ctx->privatekey)
         {
           log_info ("one keyBag already processed; skipping this one\n");
           p += ti.length;
@@ -1090,16 +1115,17 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
             goto bailout;
           len = ti.length;
 
-          result = gcry_calloc (10, sizeof *result);
-          if (!result)
+          log_assert (!ctx->privatekey);
+          ctx->privatekey = gcry_calloc (10, sizeof *ctx->privatekey);
+          if (!ctx->privatekey)
             {
-              log_error ( "error allocating result array\n");
+              log_error ("error allocating private key element array\n");
               goto bailout;
             }
-          result_count = 0;
+          keyelem_count = 0;
 
           where = "reading.keybag.key-parameters";
-          for (result_count = 0; len && result_count < 9;)
+          for (keyelem_count = 0; len && keyelem_count < 9;)
             {
               if ( parse_tag (&p, &n, &ti)
                    || ti.class || ti.tag != TAG_INTEGER)
@@ -1110,13 +1136,14 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
               if (len < ti.length)
                 goto bailout;
               len -= ti.length;
-              if (!result_count && ti.length == 1 && !*p)
+              if (!keyelem_count && ti.length == 1 && !*p)
                 ; /* ignore the very first one if it is a 0 */
               else
                 {
                   int rc;
 
-                  rc = gcry_mpi_scan (result+result_count, GCRYMPI_FMT_USG, p,
+                  rc = gcry_mpi_scan (ctx->privatekey+keyelem_count,
+                                      GCRYMPI_FMT_USG, p,
                                       ti.length, NULL);
                   if (rc)
                     {
@@ -1124,7 +1151,7 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
                                  gpg_strerror (rc));
                       goto bailout;
                     }
-                  result_count++;
+                  keyelem_count++;
                 }
               p += ti.length;
               n -= ti.length;
@@ -1161,8 +1188,8 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
             goto bailout;
 
           /* Return the certificate. */
-          if (certcb)
-            certcb (certcbarg, p, ti.length);
+          if (ctx->certcb)
+            ctx->certcb (ctx->certcbarg, p, ti.length);
 
           p += ti.length;
           n -= ti.length;
@@ -1201,32 +1228,21 @@ parse_bag_encrypted_data (const unsigned char *buffer, size_t length,
     *r_consumed = consumed;
   gcry_free (plain);
   gcry_free (cram_buffer);
-  if (r_result)
-    *r_result = result;
   return 0;
 
  bailout:
-  if (result)
-    {
-      int i;
-
-      for (i=0; result[i]; i++)
-        gcry_mpi_release (result[i]);
-      gcry_free (result);
-    }
   if (r_consumed)
     *r_consumed = consumed;
   gcry_free (plain);
   gcry_free (cram_buffer);
   log_error ("encryptedData error at \"%s\", offset %u\n",
              where, (unsigned int)((p - p_start)+startoffset));
-  if (bad_pass)
+  if (ctx->badpass)
     {
       /* Note, that the following string might be used by other programs
          to check for a bad passphrase; it should therefore not be
          translated or changed. */
       log_error ("possibly bad passphrase given\n");
-      *r_badpass = 1;
     }
   return -1;
 }
@@ -1259,11 +1275,13 @@ bag_data_p (const void *plaintext, size_t length)
 }
 
 
-static gcry_mpi_t *
-parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
-                size_t *r_consumed, char **r_curve, const char *pw)
+static gpg_error_t
+parse_shrouded_key_bag (struct p12_parse_ctx_s *ctx,
+                        const unsigned char *buffer, size_t length,
+                        int startoffset,
+                        size_t *r_consumed)
 {
-  int rc;
+  gpg_error_t err = 0;
   struct tag_info ti;
   const unsigned char *p = buffer;
   const unsigned char *p_start = buffer;
@@ -1275,61 +1293,12 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
   unsigned int iter;
   int len;
   unsigned char *plain = NULL;
-  gcry_mpi_t *result = NULL;
-  int result_count, i;
   unsigned char *cram_buffer = NULL;
   size_t consumed = 0; /* Number of bytes consumed from the original buffer. */
   int is_pbes2 = 0;
-  char *curve = NULL;
-
-  where = "start";
-  if (parse_tag (&p, &n, &ti))
-    goto bailout;
-  if (ti.class != CLASS_CONTEXT || ti.tag)
-    goto bailout;
-  if (parse_tag (&p, &n, &ti))
-    goto bailout;
-  if (ti.class || ti.tag != TAG_OCTET_STRING)
-    goto bailout;
-
-  consumed = p - p_start;
-  if (ti.is_constructed && ti.ndef)
-    {
-      /* Mozilla exported certs now come with single byte chunks of
-         octet strings.  (Mozilla Firefox 1.0.4).  Arghh. */
-      where = "cram-data.outersegs";
-      cram_buffer = cram_octet_string ( p, &n, &consumed);
-      if (!cram_buffer)
-        goto bailout;
-      p = p_start = cram_buffer;
-      if (r_consumed)
-        *r_consumed = consumed;
-      r_consumed = NULL; /* Ugly hack to not update that value any further. */
-    }
-
-
-  where = "data.outerseqs";
-  if (parse_tag (&p, &n, &ti))
-    goto bailout;
-  if (ti.class || ti.tag != TAG_SEQUENCE)
-    goto bailout;
-  if (parse_tag (&p, &n, &ti))
-    goto bailout;
-  if (ti.class || ti.tag != TAG_SEQUENCE)
-    goto bailout;
-
-  where = "data.objectidentifier";
-  if (parse_tag (&p, &n, &ti))
-    goto bailout;
-  if (ti.class || ti.tag != TAG_OBJECT_ID
-      || ti.length != DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag)
-      || memcmp (p, oid_pkcs_12_pkcs_8ShroudedKeyBag,
-                 DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag)))
-    goto bailout;
-  p += DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag);
-  n -= DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag);
+  int keyelem_count = 0;
 
-  where = "shrouded,outerseqs";
+  where = "shrouded_key_bag";
   if (parse_tag (&p, &n, &ti))
     goto bailout;
   if (ti.class != CLASS_CONTEXT || ti.tag)
@@ -1365,7 +1334,7 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
 
   if (is_pbes2)
     {
-      where = "pkcs5PBES2-params";
+      where = "shrouded_key_bag.pkcs5PBES2-params";
       if (parse_tag (&p, &n, &ti))
         goto bailout;
       if (ti.class || ti.tag != TAG_SEQUENCE)
@@ -1430,7 +1399,7 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
     }
   else
     {
-      where = "3des-params";
+      where = "shrouded_key_bag.3des-params";
       if (parse_tag (&p, &n, &ti))
         goto bailout;
       if (ti.class || ti.tag != TAG_SEQUENCE)
@@ -1456,7 +1425,7 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
         }
     }
 
-  where = "3desoraes-ciphertext";
+  where = "shrouded_key_bag.3desoraes-ciphertext";
   if (parse_tag (&p, &n, &ti))
     goto bailout;
   if (ti.class || ti.tag != TAG_OCTET_STRING || !ti.length )
@@ -1474,14 +1443,14 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
     }
   consumed += p - p_start + ti.length;
   decrypt_block (p, plain, ti.length, salt, saltlen, iter,
-                 iv, is_pbes2? 16:0, pw,
+                 iv, is_pbes2? 16:0, ctx->password,
                  is_pbes2? GCRY_CIPHER_AES128 : GCRY_CIPHER_3DES,
                  bag_data_p);
   n = ti.length;
   startoffset = 0;
   p_start = p = plain;
 
-  where = "decrypted-text";
+  where = "shrouded_key_bag.decrypted-text";
   if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_SEQUENCE)
     goto bailout;
   if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_INTEGER
@@ -1524,8 +1493,9 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
       len -= ti.nhdr;
       if (ti.class || ti.tag != TAG_OBJECT_ID)
         goto bailout;
-      curve = ksba_oid_to_str (p, ti.length);
-      if (!curve)
+      ksba_free (ctx->curve);
+      ctx->curve = ksba_oid_to_str (p, ti.length);
+      if (!ctx->curve)
         goto bailout;
       /* log_debug ("OID of curve is: %s\n", curve); */
       p += ti.length;
@@ -1546,16 +1516,22 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
     goto bailout;
   len = ti.length;
 
-  result = gcry_calloc (10, sizeof *result);
-  if (!result)
+  if (ctx->privatekey)
     {
-      log_error ( "error allocating result array\n");
+      log_error ("a key has already been received\n");
       goto bailout;
     }
-  result_count = 0;
+  ctx->privatekey = gcry_calloc (10, sizeof *ctx->privatekey);
+  if (!ctx->privatekey)
+    {
 
-  where = "reading.key-parameters";
-  if (curve)  /* ECC case.  */
+      log_error ("error allocating privatekey element array\n");
+      goto bailout;
+    }
+  keyelem_count = 0;
+
+  where = "shrouded_key_bag.reading.key-parameters";
+  if (ctx->curve)  /* ECC case.  */
     {
       if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_INTEGER)
         goto bailout;
@@ -1582,10 +1558,11 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
         goto bailout;
       len -= ti.length;
       /* log_printhex (p, ti.length, "ecc q="); */
-      rc = gcry_mpi_scan (result, GCRYMPI_FMT_USG, p, ti.length, NULL);
-      if (rc)
+      err = gcry_mpi_scan (ctx->privatekey, GCRYMPI_FMT_USG,
+                           p, ti.length, NULL);
+      if (err)
         {
-          log_error ("error parsing key parameter: %s\n", gpg_strerror (rc));
+          log_error ("error parsing key parameter: %s\n", gpg_strerror (err));
           goto bailout;
         }
       p += ti.length;
@@ -1595,7 +1572,7 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
     }
   else  /* RSA case */
     {
-      for (result_count=0; len && result_count < 9;)
+      for (keyelem_count=0; len && keyelem_count < 9;)
         {
           if (parse_tag (&p, &n, &ti) || ti.class || ti.tag != TAG_INTEGER)
             goto bailout;
@@ -1605,19 +1582,19 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
           if (len < ti.length)
             goto bailout;
           len -= ti.length;
-          if (!result_count && ti.length == 1 && !*p)
+          if (!keyelem_count && ti.length == 1 && !*p)
             ; /* ignore the very first one if it is a 0 */
           else
             {
-              rc = gcry_mpi_scan (result+result_count, GCRYMPI_FMT_USG, p,
-                                  ti.length, NULL);
-              if (rc)
+              err = gcry_mpi_scan (ctx->privatekey+keyelem_count,
+                                  GCRYMPI_FMT_USG, p, ti.length, NULL);
+              if (err)
                 {
                   log_error ("error parsing key parameter: %s\n",
-                             gpg_strerror (rc));
+                             gpg_strerror (err));
                   goto bailout;
                 }
-              result_count++;
+              keyelem_count++;
             }
           p += ti.length;
           n -= ti.length;
@@ -1630,29 +1607,217 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
 
  bailout:
   gcry_free (plain);
-  if (result)
-    {
-      for (i=0; result[i]; i++)
-        gcry_mpi_release (result[i]);
-      gcry_free (result);
+  log_error ("data error at \"%s\", offset %zu\n",
+              where, (size_t)((p - p_start) + startoffset));
+  if (!err)
+    err = gpg_error (GPG_ERR_GENERAL);
+
+ leave:
+  gcry_free (cram_buffer);
+  if (r_consumed)
+    *r_consumed = consumed;
+  return err;
+}
+
+
+static gpg_error_t
+parse_cert_bag (struct p12_parse_ctx_s *ctx,
+                const unsigned char *buffer, size_t length,
+                int startoffset,
+                size_t *r_consumed)
+{
+  gpg_error_t err = 0;
+  struct tag_info ti;
+  const unsigned char *p = buffer;
+  const unsigned char *p_start = buffer;
+  size_t n = length;
+  const char *where;
+  size_t consumed = 0; /* Number of bytes consumed from the original buffer. */
+
+  if (opt_verbose)
+    log_info ("processing certBag\n");
+
+  /* Expect:
+   *  [0]
+   *    SEQUENCE
+   *      OBJECT IDENTIFIER pkcs-12-certBag
+   */
+  where = "certbag.before.certheader";
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class != CLASS_CONTEXT || ti.tag)
+    goto bailout;
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class || ti.tag != TAG_SEQUENCE)
+    goto bailout;
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class || ti.tag != TAG_OBJECT_ID
+      || ti.length != DIM(oid_x509Certificate_for_pkcs_12)
+      || memcmp (p, oid_x509Certificate_for_pkcs_12,
+                 DIM(oid_x509Certificate_for_pkcs_12)))
+    goto bailout;
+  p += DIM(oid_x509Certificate_for_pkcs_12);
+  n -= DIM(oid_x509Certificate_for_pkcs_12);
+
+  /* Expect:
+   *  [0]
+   *    OCTET STRING encapsulates -- the certificates
+   */
+  where = "certbag.before.octetstring";
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class != CLASS_CONTEXT || ti.tag)
+    goto bailout;
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class || ti.tag != TAG_OCTET_STRING || ti.ndef)
+    goto bailout;
+
+  /* Return the certificate from the octet string. */
+  if (ctx->certcb)
+     ctx->certcb (ctx->certcbarg, p, ti.length);
+
+  p += ti.length;
+  n -= ti.length;
+
+  if (!n)
+    goto leave;  /* ready.  */
+
+  /* Expect:
+   *  SET
+   *    SEQUENCE  -- we actually ignore this.
+   */
+  where = "certbag.attribute_set";
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (!ti.class && ti.tag == TAG_SET && !ti.ndef)
+    { /* Comsume the optional SET. */
+      p += ti.length;
+      n -= ti.length;
+      if (parse_tag (&p, &n, &ti))
+        goto bailout;
     }
+
+  goto leave;
+
+ bailout:
   log_error ( "data error at \"%s\", offset %u\n",
-              where, (unsigned int)((p - buffer) + startoffset));
-  result = NULL;
+              where, (unsigned int)((p - p_start) + startoffset));
+  err = gpg_error (GPG_ERR_GENERAL);
 
  leave:
-  if (r_curve && result)
+  if (r_consumed)
+    *r_consumed = consumed;
+  return err;
+}
+
+
+static gpg_error_t
+parse_bag_data (struct p12_parse_ctx_s *ctx,
+                const unsigned char *buffer, size_t length, int startoffset,
+                size_t *r_consumed)
+{
+  gpg_error_t err = 0;
+  struct tag_info ti;
+  const unsigned char *p = buffer;
+  const unsigned char *p_start = buffer;
+  size_t n = length;
+  const char *where;
+  unsigned char *cram_buffer = NULL;
+  size_t consumed = 0; /* Number of bytes consumed from the original buffer. */
+
+  /* Expect:
+   * [0]
+   *   OCTET STRING, encapsulates
+   */
+  where = "data";
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class != CLASS_CONTEXT || ti.tag)
+    goto bailout;
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class || ti.tag != TAG_OCTET_STRING)
+    goto bailout;
+
+
+  consumed = p - p_start;
+  if (ti.is_constructed && ti.ndef)
     {
-      *r_curve = curve;
-      curve = NULL;
+      /* Mozilla exported certs now come with single byte chunks of
+         octet strings.  (Mozilla Firefox 1.0.4).  Arghh. */
+      where = "data.cram_os";
+      cram_buffer = cram_octet_string ( p, &n, &consumed);
+      if (!cram_buffer)
+        goto bailout;
+      p = p_start = cram_buffer;
+      if (r_consumed)
+        *r_consumed = consumed;
+      r_consumed = NULL; /* Ugly hack to not update that value on return. */
     }
-  else if (r_curve)
-    *r_curve = NULL;
-  ksba_free (curve);
+
+  /* Expect:
+   * SEQUENCE
+   *   SEQUENCE
+   */
+  where = "data.2seqs";
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class || ti.tag != TAG_SEQUENCE)
+    goto bailout;
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class || ti.tag != TAG_SEQUENCE)
+    goto bailout;
+
+  /* Expect:
+   * OBJECT IDENTIFIER
+   */
+  where = "data.oid";
+  if (parse_tag (&p, &n, &ti))
+    goto bailout;
+  if (ti.class || ti.tag != TAG_OBJECT_ID)
+    goto bailout;
+
+  /* Now divert to the actual parser.  */
+  if (ti.length == DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag)
+      && !memcmp (p, oid_pkcs_12_pkcs_8ShroudedKeyBag,
+                 DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag)))
+    {
+      p += DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag);
+      n -= DIM(oid_pkcs_12_pkcs_8ShroudedKeyBag);
+
+      if (parse_shrouded_key_bag (ctx, p, n,
+                                  startoffset + (p - p_start), r_consumed))
+        goto bailout;
+    }
+  else if ( ti.length == DIM(oid_pkcs_12_CertBag)
+            && !memcmp (p, oid_pkcs_12_CertBag, DIM(oid_pkcs_12_CertBag)))
+    {
+      p += DIM(oid_pkcs_12_CertBag);
+      n -= DIM(oid_pkcs_12_CertBag);
+
+      if (parse_cert_bag (ctx, p, n,
+                          startoffset + (p - p_start), r_consumed))
+        goto bailout;
+    }
+  else
+    goto bailout;
+
+  goto leave;
+
+ bailout:
+  log_error ( "data error at \"%s\", offset %u\n",
+              where, (unsigned int)((p - p_start) + startoffset));
+  err = gpg_error (GPG_ERR_GENERAL);
+
+ leave:
   gcry_free (cram_buffer);
-  if (r_consumed)
+  if (r_consumed) /* Store the number of consumed bytes unless already done. */
     *r_consumed = consumed;
-  return result;
+  return err;
 }
 
 
@@ -1661,7 +1826,8 @@ parse_bag_data (const unsigned char *buffer, size_t length, int startoffset,
    that it is only able to look for 3DES encoded encryptedData and
    tries to extract the first private key object it finds.  In case of
    an error NULL is returned. CERTCB and CERRTCBARG are used to pass
-   X.509 certificates back to the caller. */
+   X.509 certificates back to the caller.  If R_CURVE is not NULL and
+   an ECC key was found the OID of the curve is stored there. */
 gcry_mpi_t *
 p12_parse (const unsigned char *buffer, size_t length, const char *pw,
            void (*certcb)(void*, const unsigned char*, size_t),
@@ -1674,11 +1840,17 @@ p12_parse (const unsigned char *buffer, size_t length, const char *pw,
   const char *where;
   int bagseqlength, len;
   int bagseqndef, lenndef;
-  gcry_mpi_t *result = NULL;
   unsigned char *cram_buffer = NULL;
-  char *curve = NULL;
+  size_t consumed;
+  struct p12_parse_ctx_s ctx = { NULL };
 
   *r_badpass = 0;
+
+  ctx.certcb = certcb;
+  ctx.certcbarg = certcbarg;
+  ctx.password = pw;
+
+
   where = "pfx";
   if (parse_tag (&p, &n, &ti))
     goto bailout;
@@ -1734,7 +1906,7 @@ p12_parse (const unsigned char *buffer, size_t length, const char *pw,
   bagseqlength = ti.length;
   while (bagseqlength || bagseqndef)
     {
-/*       log_debug ( "at offset %u\n", (p - p_start)); */
+      /* log_debug ("p12_parse: at offset %ld\n", (p - p_start)); */
       where = "bag-sequence";
       if (parse_tag (&p, &n, &ti))
         goto bailout;
@@ -1766,16 +1938,14 @@ p12_parse (const unsigned char *buffer, size_t length, const char *pw,
       if (ti.tag == TAG_OBJECT_ID && ti.length == DIM(oid_encryptedData)
           && !memcmp (p, oid_encryptedData, DIM(oid_encryptedData)))
         {
-          size_t consumed = 0;
 
           p += DIM(oid_encryptedData);
           n -= DIM(oid_encryptedData);
           if (!lenndef)
             len -= DIM(oid_encryptedData);
           where = "bag.encryptedData";
-          if (parse_bag_encrypted_data (p, n, (p - p_start), &consumed, pw,
-                                        certcb, certcbarg,
-                                        result? NULL : &result, r_badpass))
+          consumed = 0;
+          if (parse_bag_encrypted_data (&ctx, p, n, (p - p_start), &consumed))
             goto bailout;
           if (lenndef)
             len += consumed;
@@ -1783,31 +1953,21 @@ p12_parse (const unsigned char *buffer, size_t length, const char *pw,
       else if (ti.tag == TAG_OBJECT_ID && ti.length == DIM(oid_data)
                && !memcmp (p, oid_data, DIM(oid_data)))
         {
-          if (result)
-            {
-              log_info ("already got an key object, skipping this one\n");
-              p += ti.length;
-              n -= ti.length;
-            }
-          else
-            {
-              size_t consumed = 0;
-
-              p += DIM(oid_data);
-              n -= DIM(oid_data);
-              if (!lenndef)
-                len -= DIM(oid_data);
-              result = parse_bag_data (p, n, (p - p_start),
-                                       &consumed, &curve, pw);
-              if (!result)
-                goto bailout;
-              if (lenndef)
-                len += consumed;
-            }
+          p += DIM(oid_data);
+          n -= DIM(oid_data);
+          if (!lenndef)
+            len -= DIM(oid_data);
+
+          where = "bag.data";
+          consumed = 0;
+          if (parse_bag_data (&ctx, p, n, (p - p_start), &consumed))
+            goto bailout;
+          if (lenndef)
+            len += consumed;
         }
       else
         {
-          log_info ("unknown bag type - skipped\n");
+          log_info ("unknown outer bag type - skipped\n");
           p += ti.length;
           n -= ti.length;
         }
@@ -1827,23 +1987,29 @@ p12_parse (const unsigned char *buffer, size_t length, const char *pw,
     }
 
   gcry_free (cram_buffer);
-  *r_curve = curve;
-  return result;
+  if (r_curve)
+    *r_curve = ctx.curve;
+  else
+    gcry_free (ctx.curve);
+
+  return ctx.privatekey;
 
  bailout:
   log_error ("error at \"%s\", offset %u\n",
              where, (unsigned int)(p - p_start));
-  if (result)
+  if (ctx.privatekey)
     {
       int i;
 
-      for (i=0; result[i]; i++)
-        gcry_mpi_release (result[i]);
-      gcry_free (result);
+      for (i=0; ctx.privatekey[i]; i++)
+        gcry_mpi_release (ctx.privatekey[i]);
+      gcry_free (ctx.privatekey);
+      ctx.privatekey = NULL;
     }
   gcry_free (cram_buffer);
-  gcry_free (curve);
-  *r_curve = NULL;
+  gcry_free (ctx.curve);
+  if (r_curve)
+    *r_curve = NULL;
   return NULL;
 }
 
@@ -2035,7 +2201,7 @@ create_final (struct buffer_s *sequences, const char *pw, size_t *r_length)
   /* Ready. */
   resultlen = p - result;
   if (needed != resultlen)
-    log_debug ("length mismatch: %lu, %lu\n",
+    log_debug ("p12_parse: warning: length mismatch: %lu, %lu\n",
                (unsigned long)needed, (unsigned long)resultlen);
 
   *r_length = resultlen;
@@ -2476,7 +2642,7 @@ build_key_bag (unsigned char *buffer, size_t buflen, char *salt,
 
   keybaglen = p - keybag;
   if (needed != keybaglen)
-    log_debug ("length mismatch: %lu, %lu\n",
+    log_debug ("p12_parse: warning: length mismatch: %lu, %lu\n",
                (unsigned long)needed, (unsigned long)keybaglen);
 
   *r_length = keybaglen;
@@ -2575,7 +2741,7 @@ build_cert_bag (unsigned char *buffer, size_t buflen, char *salt,
   certbaglen = p - certbag;
 
   if (needed != certbaglen)
-    log_debug ("length mismatch: %lu, %lu\n",
+    log_debug ("p12_parse: warning: length mismatch: %lu, %lu\n",
                (unsigned long)needed, (unsigned long)certbaglen);
 
   *r_length = certbaglen;
@@ -2686,7 +2852,7 @@ build_cert_sequence (const unsigned char *buffer, size_t buflen,
 
   certseqlen = p - certseq;
   if (needed != certseqlen)
-    log_debug ("length mismatch: %lu, %lu\n",
+    log_debug ("p12_parse: warning: length mismatch: %lu, %lu\n",
                (unsigned long)needed, (unsigned long)certseqlen);
 
   /* Append some pad characters; we already allocated extra space. */
@@ -2852,8 +3018,8 @@ p12_build (gcry_mpi_t *kparms, const void *cert, size_t certlen,
 }
 
 
-/* This is actually not a pkcs#12 function but one which creates an
-   unencrypted a pkcs#1 private key.  */
+/* This is actually not a PKCS#12 function but one which creates an
+ * unencrypted PKCS#1 private key.  */
 unsigned char *
 p12_raw_build (gcry_mpi_t *kparms, int rawmode, size_t *r_length)
 {
diff --git a/sm/server.c b/sm/server.c
index 2a6d7c3..e44856a 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -134,9 +134,6 @@ close_message_fd (ctrl_t ctrl)
 {
   if (ctrl->server_local->message_fd != -1)
     {
-#ifdef HAVE_W32CE_SYSTEM
-#warning Is this correct for W32/W32CE?
-#endif
       close (ctrl->server_local->message_fd);
       ctrl->server_local->message_fd = -1;
     }
@@ -871,12 +868,6 @@ cmd_message (assuan_context_t ctx, char *line)
   if (rc)
     return rc;
 
-#ifdef HAVE_W32CE_SYSTEM
-  sysfd = _assuan_w32ce_finish_pipe ((int)sysfd, 0);
-  if (sysfd == INVALID_HANDLE_VALUE)
-    return set_error (gpg_err_code_from_syserror (),
-		      "rvid conversion failed");
-#endif
 
   fd = translate_sys2libc_fd (sysfd, 0);
   if (fd == -1)
@@ -1370,13 +1361,9 @@ gpgsm_server (certlist_t default_recplist)
   /* We use a pipe based server so that we can work from scripts.
      assuan_init_pipe_server will automagically detect when we are
      called with a socketpair and ignore FILEDES in this case. */
-#ifdef HAVE_W32CE_SYSTEM
-  #define SERVER_STDIN es_fileno(es_stdin)
-  #define SERVER_STDOUT es_fileno(es_stdout)
-#else
 #define SERVER_STDIN 0
 #define SERVER_STDOUT 1
-#endif
+
   filedes[0] = assuan_fdopen (SERVER_STDIN);
   filedes[1] = assuan_fdopen (SERVER_STDOUT);
   rc = assuan_new (&ctx);
diff --git a/sm/verify.c b/sm/verify.c
index c9a4358..10d5d5c 100644
--- a/sm/verify.c
+++ b/sm/verify.c
@@ -428,7 +428,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, estream_t out_fp)
       rc = keydb_search_issuer_sn (ctrl, kh, issuer, serial);
       if (rc)
         {
-          if (rc == -1)
+          if (gpg_err_code (rc) == GPG_ERR_NOT_FOUND)
             {
               log_error ("certificate not found\n");
               rc = gpg_error (GPG_ERR_NO_PUBKEY);
diff --git a/tests/gpgscm/ffi.c b/tests/gpgscm/ffi.c
index 9baf11e..b9210c7 100644
--- a/tests/gpgscm/ffi.c
+++ b/tests/gpgscm/ffi.c
@@ -219,7 +219,7 @@ do_chdir (scheme *sc, pointer args)
   FFI_ARG_OR_RETURN (sc, char *, name, path, args);
   FFI_ARGS_DONE_OR_RETURN (sc, args);
   if (chdir (name))
-    FFI_RETURN_ERR (sc, errno);
+    FFI_RETURN_ERR (sc, gpg_error_from_syserror ());
   FFI_RETURN (sc);
 }
 
diff --git a/tests/gpgscm/init.scm b/tests/gpgscm/init.scm
index 66bec0f..4c8c512 100644
--- a/tests/gpgscm/init.scm
+++ b/tests/gpgscm/init.scm
@@ -654,8 +654,11 @@
 ;; resource management a chance to clean up.
 (define *interpreter-exit* (gensym))
 
+(define *exit-status* 0)
+
 ;; Terminate the process returning STATUS to the parent.
 (define (exit status)
+  (set! *exit-status* status)
   (throw "interpreter exit" *interpreter-exit* status))
 
 ;; A list of functions run at interpreter shutdown.
diff --git a/tests/gpgscm/tests.scm b/tests/gpgscm/tests.scm
index 5141002..eb278e3 100644
--- a/tests/gpgscm/tests.scm
+++ b/tests/gpgscm/tests.scm
@@ -192,6 +192,9 @@
 (define (in-srcdir . names)
   (canonical-path (apply path-join (cons (getenv "abs_top_srcdir") names))))
 
+(define (in-objdir . names)
+  (canonical-path (apply path-join (cons (getenv "objdir") names))))
+
 ;; Split a list of paths.
 (define (pathsep-split s)
   (string-split s *pathsep*))
@@ -288,7 +291,7 @@
 ;; Otherwise this works like mkdtemp.
 (define (mkdtemp-autoremove . components)
   (let ((dir (apply mkdtemp components)))
-    (atexit (lambda () (unlink-recursively dir)))
+    (atexit (lambda () (if (= *exit-status* 0) (unlink-recursively dir))))
     dir))
 
 (define-macro (with-temporary-working-directory . expressions)
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index be3e350..5c99a04 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -86,6 +86,7 @@ XTESTS = \
 	trust-pgp-1.scm \
 	trust-pgp-2.scm \
 	trust-pgp-3.scm \
+	trust-pgp-4.scm \
 	gpgtar.scm \
 	use-exact-key.scm \
 	default-key.scm \
@@ -277,8 +278,6 @@ CLEANFILES = prepared.stamp x y yy z out err  $(data_files) \
 	     gnupg-test.stop random_seed gpg-agent.log tofu.db \
 	     passphrases sshcontrol S.gpg-agent.ssh report.xml
 
-XTESTS += trust-pgp-4.scm
-
 clean-local:
 	-rm -rf private-keys-v1.d openpgp-revocs.d tofu.d gpgtar.d
 
diff --git a/tests/openpgp/Makefile.in b/tests/openpgp/Makefile.in
index 83c0687..a4500e0 100644
--- a/tests/openpgp/Makefile.in
+++ b/tests/openpgp/Makefile.in
@@ -460,23 +460,69 @@ TESTS_ENVIRONMENT = LC_ALL=C \
         GNUPG_BUILD_ROOT="$(abs_top_builddir)" \
 	GPGSCM_PATH="$(abs_top_srcdir)/tests/gpgscm"
 
-XTESTS = version.scm enarmor.scm mds.scm decrypt.scm \
-	decrypt-multifile.scm decrypt-dsa.scm decrypt-session-key.scm \
-	decrypt-unwrap-verify.scm sigs.scm sigs-dsa.scm encrypt.scm \
-	encrypt-multifile.scm encrypt-dsa.scm compression.scm seat.scm \
-	clearsig.scm encryptp.scm detach.scm detachm.scm armsigs.scm \
-	armencrypt.scm armencryptp.scm signencrypt.scm \
-	signencrypt-dsa.scm armsignencrypt.scm armdetach.scm \
-	armdetachm.scm genkey1024.scm conventional.scm \
-	conventional-mdc.scm multisig.scm verify.scm \
-	verify-multifile.scm gpgv.scm gpgv-forged-keyring.scm \
-	armor.scm import.scm import-revocation-certificate.scm ecc.scm \
-	4gb-packet.scm tofu.scm trust-pgp-1.scm trust-pgp-2.scm \
-	trust-pgp-3.scm gpgtar.scm use-exact-key.scm default-key.scm \
-	export.scm ssh-import.scm ssh-export.scm \
-	quick-key-manipulation.scm key-selection.scm delete-keys.scm \
-	gpgconf.scm issue2015.scm issue2346.scm issue2417.scm \
-	issue2419.scm issue2929.scm issue2941.scm trust-pgp-4.scm
+XTESTS = \
+	version.scm \
+	enarmor.scm \
+	mds.scm \
+	decrypt.scm \
+	decrypt-multifile.scm \
+	decrypt-dsa.scm \
+	decrypt-session-key.scm \
+	decrypt-unwrap-verify.scm \
+	sigs.scm \
+	sigs-dsa.scm \
+	encrypt.scm \
+	encrypt-multifile.scm \
+	encrypt-dsa.scm \
+	compression.scm \
+	seat.scm \
+	clearsig.scm \
+	encryptp.scm \
+	detach.scm \
+	detachm.scm \
+	armsigs.scm \
+	armencrypt.scm \
+	armencryptp.scm \
+	signencrypt.scm \
+	signencrypt-dsa.scm \
+	armsignencrypt.scm \
+	armdetach.scm \
+	armdetachm.scm \
+	genkey1024.scm \
+	conventional.scm \
+	conventional-mdc.scm \
+	multisig.scm \
+	verify.scm \
+	verify-multifile.scm \
+	gpgv.scm \
+	gpgv-forged-keyring.scm \
+	armor.scm \
+	import.scm \
+	import-revocation-certificate.scm \
+	ecc.scm \
+	4gb-packet.scm \
+	tofu.scm \
+	trust-pgp-1.scm \
+	trust-pgp-2.scm \
+	trust-pgp-3.scm \
+	trust-pgp-4.scm \
+	gpgtar.scm \
+	use-exact-key.scm \
+	default-key.scm \
+	export.scm \
+	ssh-import.scm \
+	ssh-export.scm \
+	quick-key-manipulation.scm \
+	key-selection.scm \
+	delete-keys.scm \
+	gpgconf.scm \
+	issue2015.scm \
+	issue2346.scm \
+	issue2417.scm \
+	issue2419.scm \
+	issue2929.scm \
+	issue2941.scm
+
 TEST_FILES = pubring.asc secring.asc plain-1o.asc plain-2o.asc plain-3o.asc \
 	     plain-1.asc plain-2.asc plain-3.asc plain-1-pgp.asc \
 	     plain-largeo.asc plain-large.asc \
diff --git a/tests/openpgp/all-tests.scm b/tests/openpgp/all-tests.scm
index 046012c..98a8a65 100644
--- a/tests/openpgp/all-tests.scm
+++ b/tests/openpgp/all-tests.scm
@@ -48,10 +48,17 @@
  (define setup-use-keyboxd (setup* "use-keyboxd"))
 
  (define all-tests
-   (parse-makefile-expand "Makefile"
+   (parse-makefile-expand (in-srcdir "tests" "openpgp" "Makefile.am")
 			  (lambda (filename port key) (parse-makefile port key))
 			  "XTESTS"))
 
+ (define keyboxd-enabled?
+   ;; Parse the variable "libexec_PROGRAMS" in kbx/Makefile
+   (not (null?
+	 (parse-makefile-expand (in-objdir "kbx" "Makefile")
+				(lambda (filename port key) (parse-makefile port key))
+				"libexec_PROGRAMS"))))
+
  (define tests
    (map (lambda (name)
 	  (test::scm setup
@@ -62,20 +69,21 @@
        (set! tests
 	     (append
 	      tests
-              ;; The second pass uses the keyboxd
-	      (map (lambda (name)
-		     (test::scm setup-use-keyboxd
-				(qualify (path-join "tests" "openpgp" name)
-					 "keyboxd")
-				(in-srcdir "tests" "openpgp" name)
-				"--use-keyboxd")) all-tests)
-              ;; The third pass uses the legact pubring.gpg
+	      ;; The second pass uses the keyboxd
+	      (if keyboxd-enabled?
+		  (map (lambda (name)
+			 (test::scm setup-use-keyboxd
+				    (qualify (path-join "tests" "openpgp" name)
+					     "keyboxd")
+				    (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")
 				(in-srcdir "tests" "openpgp" name)
 				"--use-keyring")) all-tests)
-              )))
+	      )))
 
  tests)
diff --git a/tests/openpgp/quick-key-manipulation.scm b/tests/openpgp/quick-key-manipulation.scm
index 2023f17..6cdf19a 100755
--- a/tests/openpgp/quick-key-manipulation.scm
+++ b/tests/openpgp/quick-key-manipulation.scm
@@ -34,6 +34,8 @@
 (define alpha "Alpha <alpha@invalid.example.net>")
 (define bravo "Bravo <bravo@invalid.example.net>")
 (define charlie "Charlie <charlie@invalid.example.net>")
+(define delta "Delta <delta@invalid.example.net>")
+(define deltahash "359DC5EFF98B14A58AAA615C638E8BD0CEDA537B")
 
 (define (key-data key)
   (filter (lambda (x) (or (string=? (car x) "pub")
@@ -87,6 +89,10 @@
 (info "Checking that we can revoke a user ID...")
 (call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,alpha))
 
+(info "Checking that we can revoke a user ID by its hash...")
+(call-check `(,@GPG --quick-add-uid ,(exact bravo) ,delta))
+(call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,deltahash))
+
 (info "Checking that we get an error revoking a non-existent user ID.")
 (catch '()
        (call-check `(,@GPG --quick-revoke-uid ,(exact bravo) ,charlie))
diff --git a/tests/openpgp/run-tests.scm b/tests/openpgp/run-tests.scm
index d4914bd..8f94359 100644
--- a/tests/openpgp/run-tests.scm
+++ b/tests/openpgp/run-tests.scm
@@ -32,11 +32,34 @@
 			   (path-join "tests" "openpgp" "setup.scm")
 			   (in-srcdir "tests" "openpgp" "setup.scm"))))
 
+(define (qualify path variant)
+  (string-append "<" variant ">" path))
+
+(define (setup* variant)
+  (make-environment-cache
+   (test::scm
+    #f
+    (qualify (path-join "tests" "openpgp" "setup.scm") variant)
+    (in-srcdir "tests" "openpgp" "setup.scm")
+    (string-append "--" variant))))
+
+(define setup-use-keyboxd (setup* "use-keyboxd"))
+(define use-keyboxd? (or (and (not (null? *args*))
+                              (string=? "--use-keyboxd" (car *args*)))
+                         (string=? "keyboxd" (getenv "GPGSCM_TEST_VARIANT"))))
+
 (define tests (filter (lambda (arg) (not (string-prefix? arg "--"))) *args*))
 
 (run-tests (if (null? tests)
 	       (load-tests "tests" "openpgp")
-	       (map (lambda (name)
-		      (test::scm setup
-				 (path-join "tests" "openpgp" name)
-				 (in-srcdir "tests" "openpgp" name))) tests)))
+               (if use-keyboxd?
+	           (map (lambda (name)
+		          (test::scm setup-use-keyboxd
+				     (qualify (path-join "tests" "openpgp" name)
+					      "keyboxd")
+				     (in-srcdir "tests" "openpgp" name)
+                                     "--use-keyboxd")) tests)
+	           (map (lambda (name)
+		          (test::scm setup
+				     (path-join "tests" "openpgp" name)
+				     (in-srcdir "tests" "openpgp" name))) tests))))
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9e9e13e..a6979eb 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -66,37 +66,19 @@ endif
 
 libexec_PROGRAMS = gpg-check-pattern gpg-pair-tool
 
-if !HAVE_W32CE_SYSTEM
 noinst_PROGRAMS = clean-sat make-dns-cert
-endif
 
-if !HAVE_W32CE_SYSTEM
 if BUILD_GPGTAR
   bin_PROGRAMS += gpgtar
 else
   noinst_PROGRAMS += gpgtar
 endif
-endif
 
 common_libs = $(libcommon)
 commonpth_libs = $(libcommonpth)
 
-# Some modules require PTH under W32CE.
-if HAVE_W32CE_SYSTEM
-maybe_commonpth_libs = $(commonpth_libs)
-else
-maybe_commonpth_libs = $(common_libs)
-endif
-
-if HAVE_W32CE_SYSTEM
-pwquery_libs =
-else
 pwquery_libs = ../common/libsimple-pwquery.a
-endif
 
-if HAVE_W32CE_SYSTEM
-opt_libassuan_libs = $(LIBASSUAN_LIBS)
-endif
 
 regexp_libs = ../regexp/libregexp.a
 
@@ -109,7 +91,7 @@ gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c
 
 # common sucks in gpg-error, will they, nil they (some compilers
 # do not eliminate the supposed-to-be-unused-inline-functions).
-gpgconf_LDADD = $(maybe_commonpth_libs) $(opt_libassuan_libs) \
+gpgconf_LDADD = $(common_libs) \
                 $(LIBINTL) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
 	        $(LIBICONV) $(W32SOCKLIBS) \
 	        $(gpgconf_rc_objs)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 7516a35..2c1ae5b 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -155,11 +155,10 @@ bin_PROGRAMS = gpgconf$(EXEEXT) gpg-connect-agent$(EXEEXT) \
 @HAVE_W32_SYSTEM_FALSE@am__append_10 = watchgnupg gpgparsemail ${gpg_wks_server} gpgsplit
 @HAVE_W32_SYSTEM_TRUE@am__append_11 = gpgconf-w32
 libexec_PROGRAMS = gpg-check-pattern$(EXEEXT) gpg-pair-tool$(EXEEXT)
-@HAVE_W32CE_SYSTEM_FALSE@noinst_PROGRAMS = clean-sat$(EXEEXT) \
-@HAVE_W32CE_SYSTEM_FALSE@	make-dns-cert$(EXEEXT) \
-@HAVE_W32CE_SYSTEM_FALSE@	$(am__EXEEXT_5)
-@BUILD_GPGTAR_TRUE@@HAVE_W32CE_SYSTEM_FALSE@am__append_12 = gpgtar
-@BUILD_GPGTAR_FALSE@@HAVE_W32CE_SYSTEM_FALSE@am__append_13 = gpgtar
+noinst_PROGRAMS = clean-sat$(EXEEXT) make-dns-cert$(EXEEXT) \
+	$(am__EXEEXT_5)
+@BUILD_GPGTAR_TRUE@am__append_12 = gpgtar
+@BUILD_GPGTAR_FALSE@am__append_13 = gpgtar
 subdir = tools
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/autobuild.m4 \
@@ -189,12 +188,10 @@ CONFIG_CLEAN_VPATH_FILES =
 @HAVE_W32_SYSTEM_FALSE@	gpgparsemail$(EXEEXT) $(am__EXEEXT_1) \
 @HAVE_W32_SYSTEM_FALSE@	gpgsplit$(EXEEXT)
 @HAVE_W32_SYSTEM_TRUE@am__EXEEXT_3 = gpgconf-w32$(EXEEXT)
-@BUILD_GPGTAR_TRUE@@HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_4 =  \
-@BUILD_GPGTAR_TRUE@@HAVE_W32CE_SYSTEM_FALSE@	gpgtar$(EXEEXT)
+@BUILD_GPGTAR_TRUE@am__EXEEXT_4 = gpgtar$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(sbindir)"
-@BUILD_GPGTAR_FALSE@@HAVE_W32CE_SYSTEM_FALSE@am__EXEEXT_5 =  \
-@BUILD_GPGTAR_FALSE@@HAVE_W32CE_SYSTEM_FALSE@	gpgtar$(EXEEXT)
+@BUILD_GPGTAR_FALSE@am__EXEEXT_5 = gpgtar$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS)
 clean_sat_SOURCES = clean-sat.c
 clean_sat_OBJECTS = clean-sat.$(OBJEXT)
@@ -262,21 +259,20 @@ gpg_wks_server_LINK = $(CCLD) $(gpg_wks_server_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_gpgconf_OBJECTS = gpgconf.$(OBJEXT) gpgconf-comp.$(OBJEXT)
 gpgconf_OBJECTS = $(am_gpgconf_OBJECTS)
-@HAVE_W32CE_SYSTEM_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-gpgconf_DEPENDENCIES = $(maybe_commonpth_libs) $(am__DEPENDENCIES_2) \
+gpgconf_DEPENDENCIES = $(common_libs) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(gpgconf_rc_objs)
+	$(am__DEPENDENCIES_1) $(gpgconf_rc_objs)
 gpgconf_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gpgconf_LDFLAGS) \
 	$(LDFLAGS) -o $@
 am__objects_1 = gpgconf.$(OBJEXT) gpgconf-comp.$(OBJEXT)
 am_gpgconf_w32_OBJECTS = $(am__objects_1)
 gpgconf_w32_OBJECTS = $(am_gpgconf_w32_OBJECTS)
-am__DEPENDENCIES_3 = $(maybe_commonpth_libs) $(am__DEPENDENCIES_2) \
+am__DEPENDENCIES_2 = $(common_libs) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(gpgconf_rc_objs)
-gpgconf_w32_DEPENDENCIES = $(am__DEPENDENCIES_3)
+	$(am__DEPENDENCIES_1) $(gpgconf_rc_objs)
+gpgconf_w32_DEPENDENCIES = $(am__DEPENDENCIES_2)
 gpgconf_w32_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(gpgconf_w32_LDFLAGS) $(LDFLAGS) -o $@
 am_gpgparsemail_OBJECTS = gpgparsemail.$(OBJEXT) rfc822parse.$(OBJEXT)
@@ -677,13 +673,7 @@ sbin_SCRIPTS = addgnupghome applygnupgdefaults
 @BUILD_WKS_TOOLS_TRUE@gpg_wks_server = gpg-wks-server
 common_libs = $(libcommon)
 commonpth_libs = $(libcommonpth)
-@HAVE_W32CE_SYSTEM_FALSE@maybe_commonpth_libs = $(common_libs)
-
-# Some modules require PTH under W32CE.
-@HAVE_W32CE_SYSTEM_TRUE@maybe_commonpth_libs = $(commonpth_libs)
-@HAVE_W32CE_SYSTEM_FALSE@pwquery_libs = ../common/libsimple-pwquery.a
-@HAVE_W32CE_SYSTEM_TRUE@pwquery_libs = 
-@HAVE_W32CE_SYSTEM_TRUE@opt_libassuan_libs = $(LIBASSUAN_LIBS)
+pwquery_libs = ../common/libsimple-pwquery.a
 regexp_libs = ../regexp/libregexp.a
 gpgsplit_LDADD = $(common_libs) \
 	         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
@@ -693,7 +683,7 @@ gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c
 
 # common sucks in gpg-error, will they, nil they (some compilers
 # do not eliminate the supposed-to-be-unused-inline-functions).
-gpgconf_LDADD = $(maybe_commonpth_libs) $(opt_libassuan_libs) \
+gpgconf_LDADD = $(common_libs) \
                 $(LIBINTL) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(NETLIBS) \
 	        $(LIBICONV) $(W32SOCKLIBS) \
 	        $(gpgconf_rc_objs)
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c
index cecebf6..6132ef0 100644
--- a/tools/gpg-connect-agent.c
+++ b/tools/gpg-connect-agent.c
@@ -58,6 +58,7 @@ enum cmd_and_opt_values
     oExec       = 'E',
     oRun        = 'r',
     oSubst      = 's',
+    oUnBuffered = 'u',
 
     oNoVerbose	= 500,
     oHomedir,
@@ -110,6 +111,7 @@ static gpgrt_opt_t opts[] = {
   ARGPARSE_s_s (oDirmngrProgram, "dirmngr-program", "@"),
   ARGPARSE_s_s (oKeyboxdProgram, "keyboxd-program", "@"),
   ARGPARSE_s_s (oChUid,          "chuid",           "@"),
+  ARGPARSE_s_n (oUnBuffered,     "unbuffered", "@"),
 
   ARGPARSE_end ()
 };
@@ -137,6 +139,7 @@ struct
   int enable_varsubst;  /* Set if variable substitution is enabled.  */
   int trim_leading_spaces;
   int no_history;
+  int unbuffered; /* Set if unbuffered mode for stdin/out is preferred.  */
 } opt;
 
 
@@ -1005,10 +1008,7 @@ do_open (char *line)
   if (fd >= 0 && fd < DIM (open_fd_table))
     {
       open_fd_table[fd].inuse = 1;
-#ifdef HAVE_W32CE_SYSTEM
-# warning fixme: implement our pipe emulation.
-#endif
-#if defined(HAVE_W32_SYSTEM) && !defined(HAVE_W32CE_SYSTEM)
+#if defined(HAVE_W32_SYSTEM)
       {
         HANDLE prochandle, handle, newhandle;
 
@@ -1038,12 +1038,12 @@ do_open (char *line)
         log_info ("file '%s' opened in \"%s\" mode, fd=%d  (libc=%d)\n",
                    name, mode, (int)open_fd_table[fd].handle, fd);
       set_int_var (varname, (int)open_fd_table[fd].handle);
-#else
+#else /* Unix */
       if (opt.verbose)
         log_info ("file '%s' opened in \"%s\" mode, fd=%d\n",
                    name, mode, fd);
       set_int_var (varname, fd);
-#endif
+#endif /* Unix */
     }
   else
     {
@@ -1242,6 +1242,7 @@ main (int argc, char **argv)
           opt.trim_leading_spaces = 1;
           break;
         case oChUid:     changeuser = pargs.r.ret_str; break;
+        case oUnBuffered: opt.unbuffered = 1; break;
 
         default: pargs.err = 2; break;
 	}
@@ -1318,8 +1319,7 @@ main (int argc, char **argv)
       assuan_fd_t no_close[3];
 
       no_close[0] = assuan_fd_from_posix_fd (es_fileno (es_stderr));
-      no_close[1] = assuan_fd_from_posix_fd (log_get_fd ());
-      no_close[2] = ASSUAN_INVALID_FD;
+      no_close[1] = ASSUAN_INVALID_FD;
 
       rc = assuan_new (&ctx);
       if (rc)
@@ -1402,6 +1402,11 @@ main (int argc, char **argv)
         log_info (_("receiving line failed: %s\n"), gpg_strerror (rc) );
     }
 
+  if (!script_fp && opt.unbuffered)
+    {
+      gpgrt_setvbuf (gpgrt_stdin, NULL, _IONBF, 0);
+      setvbuf (stdout, NULL, _IONBF, 0);
+    }
 
   for (loopidx=0; loopidx < DIM (loopstack); loopidx++)
     loopstack[loopidx].collecting = 0;
@@ -1969,6 +1974,7 @@ handle_inquire (assuan_context_t ctx, char *line)
   FILE *fp = NULL;
   char buffer[1024];
   int rc, n;
+  int cancelled = 0;
 
   /* Skip the command and trailing spaces. */
   for (; *line && !spacep (line); line++)
@@ -2013,11 +2019,7 @@ handle_inquire (assuan_context_t ctx, char *line)
     {
       if (d->is_prog)
         {
-#ifdef HAVE_W32CE_SYSTEM
-          fp = NULL;
-#else
           fp = popen (d->file, "r");
-#endif
           if (!fp)
             log_error ("error executing '%s': %s\n",
                        d->file, strerror (errno));
@@ -2050,21 +2052,20 @@ handle_inquire (assuan_context_t ctx, char *line)
         log_error ("error reading from '%s': %s\n", d->file, strerror (errno));
     }
 
-  rc = assuan_send_data (ctx, NULL, 0);
-  if (rc)
-    log_error ("sending data back failed: %s\n", gpg_strerror (rc) );
-
   if (d->is_var)
     ;
   else if (d->is_prog)
     {
-#ifndef HAVE_W32CE_SYSTEM
       if (pclose (fp))
-        log_error ("error running '%s': %s\n", d->file, strerror (errno));
-#endif
+        cancelled = 1;
     }
   else
     fclose (fp);
+
+  rc = assuan_send_data (ctx, NULL, cancelled);
+  if (rc)
+    log_error ("sending data back failed: %s\n", gpg_strerror (rc) );
+
   return 1;
 }
 
diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 704bdca..7cd45c7 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -2974,7 +2974,7 @@ key_matches_user_or_group (char *user)
   /* Under Windows we don't support groups. */
   if (group && *group)
     gc_error (0, 0, _("Note that group specifications are ignored\n"));
-#ifndef HAVE_W32CE_SYSTEM
+
   if (*user)
     {
       static char *my_name;
@@ -2994,8 +2994,9 @@ key_matches_user_or_group (char *user)
       if (!strcmp (user, my_name))
         return 1; /* Found.  */
     }
-#endif /*HAVE_W32CE_SYSTEM*/
+
 #else /*!HAVE_W32_SYSTEM*/
+
   /* First check whether the user matches.  */
   if (*user)
     {
@@ -3054,7 +3055,9 @@ key_matches_user_or_group (char *user)
         if (!strcmp (group, my_supgroups[n]))
           return 1; /* Found.  */
     }
+
 #endif /*!HAVE_W32_SYSTEM*/
+
   return 0; /* No match.  */
 }
 
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index ff6db42..2e693ac 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -53,6 +53,8 @@ enum cmd_and_opt_values
     aListDirs   = 'L',
     aKill       = 'K',
     aReload     = 'R',
+    aShowVersions = 'V',
+    aShowConfigs  = 'X',
 
     oNoVerbose	= 500,
     oHomedir,
@@ -74,8 +76,6 @@ enum cmd_and_opt_values
     aCreateSocketDir,
     aRemoveSocketDir,
     aApplyProfile,
-    aShowVersions,
-    aShowConfigs,
     aShowCodepages
   };
 
@@ -107,8 +107,8 @@ static gpgrt_opt_t opts[] =
     { aKill,          "kill", 256,   N_("kill a given component")},
     { aCreateSocketDir, "create-socketdir", 256, "@"},
     { aRemoveSocketDir, "remove-socketdir", 256, "@"},
-    ARGPARSE_c (aShowVersions, "show-versions", "@"),
-    ARGPARSE_c (aShowConfigs,  "show-configs", "@"),
+    ARGPARSE_c (aShowVersions, "show-versions", ""),
+    ARGPARSE_c (aShowConfigs,  "show-configs", ""),
     ARGPARSE_c (aShowCodepages, "show-codepages", "@"),
 
     { 301, NULL, 0, N_("@\nOptions:\n ") },
@@ -1079,8 +1079,43 @@ get_revision_from_blurb (const char *blurb, int *r_len)
 static void
 show_version_gnupg (estream_t fp, const char *prefix)
 {
+  char *fname, *p;
+  size_t n;
+  estream_t verfp;
+  char line[100];
+
   es_fprintf (fp, "%s%sGnuPG %s (%s)\n%s%s\n", prefix, *prefix?"":"* ",
               gpgrt_strusage (13), BUILD_REVISION, prefix, gpgrt_strusage (17));
+
+  /* Show the GnuPG VS-Desktop version in --show-configs mode  */
+  if (prefix && *prefix == '#')
+    {
+      fname = make_filename (gnupg_bindir (), NULL);
+      n = strlen (fname);
+      if (n > 10 && (!ascii_strcasecmp (fname + n - 10, "/GnuPG/bin")
+                     || !ascii_strcasecmp (fname + n - 10, "\\GnuPG\\bin")))
+        {
+          /* Append VERSION to the ../../ direcory.  Note that VERSION
+           * is only 7 bytes and thus fits.  */
+          strcpy (fname + n - 9, "VERSION");
+          verfp = es_fopen (fname, "r");
+          if (!verfp)
+            es_fprintf (fp, "%s[VERSION file not found]\n", prefix);
+          else if (!es_fgets (line, sizeof line, verfp))
+            es_fprintf (fp, "%s[VERSION file is empty]\n", prefix);
+          else
+            {
+              trim_spaces (line);
+              for (p=line; *p; p++)
+                if (*p < ' ' || *p > '~' || *p == '[')
+                  *p = '?';
+              es_fprintf (fp, "%s%s\n", prefix, line);
+            }
+          es_fclose (verfp);
+        }
+      xfree (fname);
+    }
+
 #ifdef HAVE_W32_SYSTEM
   {
     OSVERSIONINFO osvi = { sizeof (osvi) };